Merge branch 'dev' into Fix-Bugs-Related-TextForm-Routine

sp-1493-data-formatting-2.0.

analysis_options.yaml

@@ -10,6 +10,7 @@
 analyzer:
   errors:
     constant_identifier_names: ignore
+    overridden_fields: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

assets/icons/energy_consumed_icon.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 6.90237L13.6328 13.1837L6.60156 6.1524L2.32422 10.418L1.50391 9.59769L6.60156 4.48828L13.6328 11.5195L19.1797 6.08206L20 6.90237Z" fill="#64E1DC"/>
+<path d="M20 13.1133L19.1797 13.9336L13.6328 8.49615L7.77344 14.3555L5.42969 12.0118L2.32422 15.1055L1.50391 14.2852L5.42969 10.3477L7.77344 12.6914L13.6328 6.83203L20 13.1133Z" fill="#FDBF00"/>
+<path d="M20 6.90234L13.6328 13.1836L10.1172 9.668V8.00388L13.6328 11.5195L19.1797 6.08203L20 6.90234Z" fill="#00C8C8"/>
+<path d="M20 13.1133L19.1797 13.9336L13.6328 8.49615L10.1172 12.0118V10.3477L13.6328 6.83203L20 13.1133Z" fill="#FF9100"/>
+<path d="M19.1714 17.625V18.7813L17.7184 18.7821L10.1172 18.7851L1.32812 18.7891V0.75H2.5V17.625H19.1714Z" fill="#676E74"/>
+<path d="M3.0127 2.37976L1.91406 1.50024L0.732422 2.37976L0 1.46423L1.91406 0L3.74512 1.46423L3.0127 2.37976Z" fill="#676E74"/>
+<path d="M19.1714 17.625V18.7813L17.7176 18.7824L17.7184 18.7821L10.1172 18.7851V17.625H19.1714Z" fill="#474F54"/>
+<path d="M19.9998 18.2108L18.1205 19.9999L17.292 19.1714L17.7174 18.7823L17.7182 18.782L18.3427 18.2108L17.7565 17.6249L17.292 17.1604L18.1205 16.332L19.9998 18.2108Z" fill="#474F54"/>
+</svg>

assets/icons/landing_analytics.svg

@@ -0,0 +1,19 @@
+<svg width="101" height="101" viewBox="0 0 101 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9554_2115)">
+<path d="M93.8334 86.1048C97.5937 86.1048 100.653 83.0454 100.653 79.2849V9.83487C100.653 4.4501 96.2722 0.0692444 90.8875 0.0692444H10.4187C5.03394 0.0692444 0.653076 4.4501 0.653076 9.83487V79.2849C0.653076 83.0454 3.71245 86.1048 7.4728 86.1048H9.63745V96.163H2.6062C1.52749 96.163 0.653076 97.0376 0.653076 98.1161C0.653076 99.1946 1.52749 100.069 2.6062 100.069H98.7C99.7787 100.069 100.653 99.1946 100.653 98.1161C100.653 97.0376 99.7787 96.163 98.7 96.163H91.6687V86.1048H93.8334ZM4.55933 9.83487C4.55933 6.60401 7.18784 3.97549 10.4187 3.97549H90.8875C94.1183 3.97549 96.7468 6.60401 96.7468 9.83487V14.1317H4.75542C4.68921 14.1317 4.62378 14.1353 4.55933 14.1417V9.83487ZM22.1375 96.163H13.5437V78.5849H22.1375V96.163ZM44.0125 96.163H35.4187V56.9896H44.0125V96.163ZM65.8875 96.163H57.2937V73.5067H65.8875V96.163ZM89.7156 50.1669H77.2156C76.1369 50.1669 75.2625 51.0415 75.2625 52.12V61.9831C75.2625 63.0616 76.1369 63.9362 77.2156 63.9362C78.2943 63.9362 79.1687 63.0616 79.1687 61.9831V54.0732H87.7625V96.163H79.1687V75.1181C79.1687 74.0396 78.2943 73.1649 77.2156 73.1649C76.1369 73.1649 75.2625 74.0396 75.2625 75.1181V96.163H69.7937V71.5536C69.7937 70.4751 68.9193 69.6005 67.8406 69.6005H55.3406C54.2619 69.6005 53.3875 70.4751 53.3875 71.5536V96.163H47.9187V55.0364C47.9187 53.9579 47.0443 53.0833 45.9656 53.0833H33.4656C32.3869 53.0833 31.5125 53.9579 31.5125 55.0364V96.163H26.0437V76.6317C26.0437 75.5532 25.1693 74.6786 24.0906 74.6786H11.5906C10.5119 74.6786 9.63745 75.5532 9.63745 76.6317V82.1985H7.4728C5.86616 82.1985 4.55933 80.8915 4.55933 79.2849V18.028C4.62378 18.0345 4.68921 18.038 4.75542 18.038H96.7468V79.2849C96.7468 80.8915 95.4398 82.1985 93.8334 82.1985H91.6687V52.12C91.6687 51.0415 90.7943 50.1669 89.7156 50.1669Z" fill="white"/>
+<path d="M88.1531 7.10049H44.0251C42.9464 7.10049 42.072 7.9751 42.072 9.05362C42.072 10.1321 42.9464 11.0067 44.0251 11.0067H88.1531C89.2318 11.0067 90.1062 10.1321 90.1062 9.05362C90.1062 7.9751 89.2318 7.10049 88.1531 7.10049Z" fill="white"/>
+<path d="M22.3464 7.67276C21.9832 7.30948 21.4792 7.10049 20.9656 7.10049C20.4519 7.10049 19.948 7.30928 19.5847 7.67276C19.2214 8.03604 19.0125 8.53995 19.0125 9.05362C19.0125 9.56729 19.2214 10.0712 19.5847 10.4343C19.948 10.7978 20.4519 11.0067 20.9656 11.0067C21.4792 11.0067 21.9832 10.7978 22.3464 10.4343C22.7097 10.0712 22.9187 9.56729 22.9187 9.05362C22.9187 8.53995 22.7097 8.03604 22.3464 7.67276Z" fill="white"/>
+<path d="M14.5339 7.67276C14.1707 7.30948 13.6667 7.10049 13.1531 7.10049C12.6394 7.10049 12.1355 7.30928 11.7722 7.67276C11.4089 8.03604 11.2 8.53995 11.2 9.05362C11.2 9.56729 11.4089 10.0712 11.7722 10.4343C12.1355 10.7978 12.6394 11.0067 13.1531 11.0067C13.6667 11.0067 14.1707 10.7978 14.5339 10.4343C14.8972 10.0712 15.1062 9.56729 15.1062 9.05362C15.1062 8.53995 14.8972 8.03604 14.5339 7.67276Z" fill="white"/>
+<path d="M30.1589 7.67276C29.7957 7.30948 29.2937 7.10049 28.7781 7.10049C28.2644 7.10049 27.7605 7.30928 27.3972 7.67276C27.0339 8.03604 26.825 8.53995 26.825 9.05362C26.825 9.56729 27.0339 10.0712 27.3972 10.4343C27.7605 10.7978 28.2644 11.0067 28.7781 11.0067C29.2917 11.0067 29.7957 10.7978 30.1589 10.4343C30.5222 10.0712 30.7312 9.56729 30.7312 9.05362C30.7312 8.53995 30.5222 8.03604 30.1589 7.67276Z" fill="white"/>
+<path d="M78.5964 67.5634C78.2332 67.1981 77.7292 66.9911 77.2156 66.9911C76.7019 66.9911 76.198 67.1983 75.8347 67.5634C75.4714 67.9267 75.2625 68.4306 75.2625 68.9442C75.2625 69.4579 75.4714 69.9618 75.8347 70.3251C76.198 70.6882 76.7019 70.8974 77.2156 70.8974C77.7292 70.8974 78.2332 70.6884 78.5964 70.3251C78.9597 69.9618 79.1687 69.4579 79.1687 68.9442C79.1687 68.4286 78.9597 67.9267 78.5964 67.5634Z" fill="white"/>
+<path d="M83.4656 26.6198C79.5885 26.6198 76.4344 29.7739 76.4344 33.6511C76.4344 35.1911 76.9334 36.6161 77.7764 37.7757L64.8027 50.7493C63.7959 50.1921 62.6393 49.8737 61.4092 49.8737C60.3008 49.8737 59.252 50.1325 58.3186 50.5913L44.7719 37.0446C45.3291 36.0378 45.6475 34.8812 45.6475 33.6511C45.6475 29.7739 42.4934 26.6198 38.6162 26.6198C34.7391 26.6198 31.585 29.7739 31.585 33.6511C31.585 35.0062 31.9713 36.2722 32.6381 37.3468L21.1043 48.8804C20.0975 48.3232 18.9408 48.0048 17.7109 48.0048C13.8338 48.0048 10.6797 51.1589 10.6797 55.0361C10.6797 58.9132 13.8338 62.0673 17.7109 62.0673C21.5881 62.0673 24.7422 58.9132 24.7422 55.0361C24.7422 53.806 24.4238 52.6493 23.8666 51.6425L35.5381 39.971C36.4684 40.4259 37.5129 40.6821 38.6162 40.6821C39.8461 40.6821 41.0027 40.3638 42.0096 39.8066L55.4236 53.2204C54.7613 54.2927 54.3779 55.5544 54.3779 56.9046C54.3779 60.7818 57.532 63.9359 61.4092 63.9359C65.2863 63.9359 68.4404 60.7818 68.4404 56.9046C68.4404 55.6745 68.1221 54.5179 67.5648 53.5111L80.8861 40.1898C81.6855 40.5066 82.5553 40.6823 83.4656 40.6823C87.3428 40.6823 90.4969 37.5282 90.4969 33.6511C90.4969 29.7739 87.3428 26.6198 83.4656 26.6198ZM17.7111 58.1614C15.9881 58.1614 14.5861 56.7595 14.5861 55.0364C14.5861 53.3134 15.9881 51.9114 17.7111 51.9114C19.4342 51.9114 20.8361 53.3134 20.8361 55.0364C20.8361 56.7595 19.4342 58.1614 17.7111 58.1614ZM38.6164 36.7761C36.8934 36.7761 35.4914 35.3741 35.4914 33.6511C35.4914 31.928 36.8934 30.5261 38.6164 30.5261C40.3395 30.5261 41.7414 31.928 41.7414 33.6511C41.7414 35.3741 40.3395 36.7761 38.6164 36.7761ZM61.4094 60.03C59.6863 60.03 58.2844 58.628 58.2844 56.905C58.2844 55.182 59.6863 53.78 61.4094 53.78C63.1324 53.78 64.5344 55.182 64.5344 56.905C64.5344 58.628 63.1324 60.03 61.4094 60.03ZM83.4656 36.7761C81.7426 36.7761 80.3406 35.3741 80.3406 33.6511C80.3406 31.928 81.7426 30.5261 83.4656 30.5261C85.1887 30.5261 86.5906 31.928 86.5906 33.6511C86.5906 35.3741 85.1887 36.7761 83.4656 36.7761Z" fill="white"/>
+<path d="M29.6238 25.255C29.2585 24.8917 28.7566 24.6825 28.2429 24.6825C27.7273 24.6825 27.2234 24.8915 26.8601 25.255C26.4968 25.6181 26.2898 26.122 26.2898 26.6357C26.2898 27.1493 26.4968 27.6532 26.8601 28.0165C27.2253 28.3798 27.7273 28.5888 28.2429 28.5888C28.7566 28.5888 29.2585 28.38 29.6238 28.0165C29.9871 27.6532 30.196 27.1493 30.196 26.6357C30.196 26.122 29.9871 25.6181 29.6238 25.255Z" fill="white"/>
+<path d="M20.9656 24.6827H11.5906C10.5119 24.6827 9.63745 25.5573 9.63745 26.6358C9.63745 27.7143 10.5119 28.589 11.5906 28.589H20.9656C22.0443 28.589 22.9187 27.7143 22.9187 26.6358C22.9187 25.5573 22.0443 24.6827 20.9656 24.6827Z" fill="white"/>
+<path d="M20.9656 34.0577H11.5906C10.5119 34.0577 9.63745 34.9323 9.63745 36.0108C9.63745 37.0893 10.5119 37.964 11.5906 37.964H20.9656C22.0443 37.964 22.9187 37.0893 22.9187 36.0108C22.9187 34.9323 22.0443 34.0577 20.9656 34.0577Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_9554_2115">
+<rect width="100" height="100" fill="white" transform="translate(0.653076 0.0692444)"/>
+</clipPath>
+</defs>
+</svg>

lib/pages/analytics/models/occupacy.dart

@@ -1,18 +1,32 @@
 import 'package:equatable/equatable.dart';
 
 class Occupacy extends Equatable {
-  final String date;
+  final DateTime date;
   final String occupancy;
+  final String spaceUuid;
+  final int occupiedSeconds;
 
-  const Occupacy({required this.date, required this.occupancy});
+  const Occupacy({
+    required this.date,
+    required this.occupancy,
+    required this.spaceUuid,
+    required this.occupiedSeconds,
+  });
 
   factory Occupacy.fromJson(Map<String, dynamic> json) {
     return Occupacy(
-      date: json['date'] as String,
-      occupancy: json['occupancy'] as String,
+      date: DateTime.parse(json['event_date'] as String? ?? '${DateTime.now()}'),
+      occupancy: (json['occupancy_percentage'] ?? 0).toString(),
+      spaceUuid: json['space_uuid'] as String? ?? '',
+      occupiedSeconds: json['occupied_seconds'] as int? ?? 0,
     );
   }
 
   @override
-  List<Object?> get props => [date, occupancy];
+  List<Object?> get props => [
+        date,
+        occupancy,
+        spaceUuid,
+        occupiedSeconds,
+      ];
 }

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

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
+import 'package:syncrow_web/pages/analytics/params/get_analytics_devices_param.dart';
+
+abstract final class FetchAirQualityDataHelper {
+  const FetchAirQualityDataHelper._();
+
+  static void loadAirQualityData(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    loadAnalyticsDevices(
+      context,
+      communityUuid: communityUuid,
+      spaceUuid: spaceUuid,
+    );
+  }
+
+  static void clearAllData(BuildContext context) {
+    context.read<AnalyticsDevicesBloc>().add(
+          const ClearAnalyticsDeviceEvent(),
+        );
+    context.read<RealtimeDeviceChangesBloc>().add(
+          const RealtimeDeviceChangesClosed(),
+        );
+  }
+
+  static void loadAnalyticsDevices(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    context.read<AnalyticsDevicesBloc>().add(
+          LoadAnalyticsDevicesEvent(
+            param: GetAnalyticsDevicesParam(
+              communityUuid: communityUuid,
+              spaceUuid: spaceUuid,
+              deviceTypes: ['AQI'],
+              requestType: AnalyticsDeviceRequestType.energyManagement,
+            ),
+            onSuccess: (device) {
+              context.read<RealtimeDeviceChangesBloc>()
+                ..add(const RealtimeDeviceChangesClosed())
+                ..add(RealtimeDeviceChangesStarted(device.uuid));
+            },
+          ),
+        );
+  }
+}

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

@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
+
+class AirQualityView extends StatelessWidget {
+  const AirQualityView({super.key});
+
+  static const _padding = EdgeInsetsDirectional.all(32);
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isMediumOrLess = constraints.maxWidth <= 900;
+        final height = MediaQuery.sizeOf(context).height;
+        if (isMediumOrLess) {
+          return SingleChildScrollView(
+            padding: _padding,
+            child: Column(
+              spacing: 32,
+              children: [
+                SizedBox(
+                  height: height * 1.2,
+                  child: const AirQualityEndSideWidget(),
+                ),
+                SizedBox(height: height * 0.5, child: const Placeholder()),
+                SizedBox(height: height * 0.5, child: const Placeholder()),
+              ],
+            ),
+          );
+        }
+
+        return SingleChildScrollView(
+          child: Container(
+            padding: _padding,
+            height: height,
+            child: const Column(
+              children: [
+                Expanded(
+                  child: Row(
+                    spacing: 32,
+                    children: [
+                      Expanded(
+                        flex: 2,
+                        child: Column(
+                          spacing: 20,
+                          children: [
+                            Expanded(child: Placeholder()),
+                            Expanded(child: Placeholder()),
+                          ],
+                        ),
+                      ),
+                      Expanded(child: AirQualityEndSideWidget()),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

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

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AirQualityEndSideWidget extends StatelessWidget {
+  const AirQualityEndSideWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration.copyWith(
+        borderRadius: BorderRadius.circular(30),
+      ),
+      padding: const EdgeInsetsDirectional.all(32),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildHeader(context),
+          Text(
+            'Device ID:',
+            style: context.textTheme.bodySmall?.copyWith(
+              color: ColorsManager.textPrimaryColor,
+              fontWeight: FontWeight.w400,
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(height: 6),
+          SelectableText(
+            context.watch<AnalyticsDevicesBloc>().state.selectedDevice?.uuid ??
+                'N/A',
+            style: context.textTheme.bodySmall?.copyWith(
+              color: ColorsManager.blackColor,
+              fontWeight: FontWeight.w400,
+              fontSize: 12,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildHeader(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Expanded(
+          flex: 3,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerStart,
+            child: SelectableText(
+              'AQI Sensor',
+              style: context.textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.w700,
+                color: ColorsManager.vividBlue.withValues(alpha: 0.6),
+                fontSize: 18,
+              ),
+            ),
+          ),
+        ),
+        const Spacer(),
+        Expanded(
+          flex: 2,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerEnd,
+            child: AnalyticsDeviceDropdown(
+              onChanged: (value) {
+                context.read<AnalyticsDevicesBloc>().add(
+                      SelectAnalyticsDeviceEvent(value),
+                    );
+                FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
+                  context,
+                  deviceUuid: value.uuid,
+                );
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/pages/analytics/modules/analytics/enums/analytics_page_tab.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/views/air_quality_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart';
 
@@ -10,6 +11,10 @@ enum AnalyticsPageTab {
   occupancy(
     title: 'Occupancy',
     child: AnalyticsOccupancyView(),
+  ),
+  airQuality(
+    title: 'Air Quality',
+    child: AirQualityView(),
   );
 
   const AnalyticsPageTab({

lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
+  @override
+  void onCommunitySelected(
+    BuildContext context,
+    CommunityModel community,
+    List<SpaceModel> spaces,
+  ) {
+    // Do nothing
+  }
+
+  @override
+  void onSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel space,
+  ) {
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
+
+    if (isSpaceSelected) {
+      clearData(context);
+      return;
+    }
+
+    spaceTreeBloc
+      ..add(const SpaceTreeClearSelectionEvent())
+      ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+
+    FetchAirQualityDataHelper.loadAirQualityData(
+      context,
+      communityUuid: community.uuid,
+      spaceUuid: space.uuid ?? '',
+    );
+  }
+
+  @override
+  void onChildSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel child,
+  ) {
+    return onSpaceSelected(context, community, child);
+  }
+
+  @override
+  void clearData(BuildContext context) {
+    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    FetchAirQualityDataHelper.clearAllData(context);
+  }
+}

lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart

@@ -1,4 +1,5 @@
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart';
@@ -9,6 +10,7 @@ abstract final class AnalyticsDataLoadingStrategyFactory {
     return switch (tab) {
       AnalyticsPageTab.energyManagement => EnergyManagementDataLoadingStrategy(),
       AnalyticsPageTab.occupancy => OccupancyDataLoadingStrategy(),
+      AnalyticsPageTab.airQuality => AirQualityDataLoadingStrategy(),
     };
   }
 }

lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart

@@ -14,7 +14,6 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     List<SpaceModel> spaces,
   ) {
-    // Add to space tree bloc first
     context.read<SpaceTreeBloc>().add(
           OnCommunitySelected(
             community.uuid,
@@ -69,7 +68,7 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     SpaceModel child,
   ) {
-    // Do nothing else as per original implementation
+    return onSpaceSelected(context, community, child);
   }
 
   @override

lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart

@@ -14,23 +14,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     CommunityModel community,
     List<SpaceModel> spaces,
   ) {
-    context.read<SpaceTreeBloc>().add(
-          OnCommunitySelected(
-            community.uuid,
-            spaces.isNotEmpty ? [spaces.first] : [],
-          ),
-        );
-
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid)) {
-      clearData(context);
-      return;
-    }
-    FetchOccupancyDataHelper.loadOccupancyData(
-      context,
-      communityId: community.uuid,
-      spaceId: spaces.isNotEmpty ? spaces.first.uuid ?? '' : '',
-    );
+    // Do Nothing
   }
 
   @override
@@ -40,26 +24,17 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     SpaceModel space,
   ) {
     final spaceTreeBloc = context.read<SpaceTreeBloc>();
-    final selectedSpacesIds = spaceTreeBloc.state.selectedSpaces;
-    final isSpaceSelected = selectedSpacesIds.contains(space.uuid);
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
 
-    if (selectedSpacesIds.isEmpty) {
-      spaceTreeBloc.add(OnCommunitySelected(community.uuid, [space]));
-    } else if (isSpaceSelected) {
-      spaceTreeBloc.add(const SpaceTreeClearSelectionEvent());
-    } else {
-      spaceTreeBloc
-        ..add(const SpaceTreeClearSelectionEvent())
-        ..add(OnSpaceSelected(community, space.uuid ?? '', []));
-    }
-
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid) ||
-        spaceTreeState.selectedSpaces.contains(space.uuid)) {
+    if (isSpaceSelected) {
       clearData(context);
       return;
     }
 
+    spaceTreeBloc
+      ..add(const SpaceTreeClearSelectionEvent())
+      ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+
     FetchOccupancyDataHelper.loadOccupancyData(
       context,
       communityId: community.uuid,
@@ -73,7 +48,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     CommunityModel community,
     SpaceModel child,
   ) {
-    // Do nothing
+    return onSpaceSelected(context, community, child);
   }
 
   @override

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

@@ -17,7 +17,7 @@ import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_en
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
-import 'package:syncrow_web/pages/analytics/services/occupacy/fake_occupacy_service.dart';
+import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
@@ -75,7 +75,11 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
             FirebaseRealtimeDeviceService(),
           ),
         ),
-        BlocProvider(create: (context) => OccupancyBloc(FakeOccupacyService())),
+        BlocProvider(
+          create: (context) => OccupancyBloc(
+            RemoteOccupancyService(_httpService),
+          ),
+        ),
         BlocProvider(
           create: (context) => OccupancyHeatMapBloc(
             RemoteOccupancyHeatMapService(_httpService),

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

@@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper {
         sideTitles: SideTitles(
           showTitles: true,
           maxIncluded: false,
-          minIncluded: true,
+          minIncluded: false,
           interval: leftTitlesInterval,
           reservedSize: 110,
           getTitlesWidget: (value, meta) => Padding(
@@ -50,7 +50,7 @@ abstract final class EnergyManagementChartsHelper {
                 value.formatNumberToKwh,
                 style: context.textTheme.bodySmall?.copyWith(
                   fontSize: 12,
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                 ),
               ),
             ),

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

@@ -170,7 +170,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
               child: Text(
                 month,
                 style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                   fontSize: 11,
                 ),
               ),

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

@@ -19,10 +19,12 @@ class EnergyConsumptionByPhasesChartBox extends StatelessWidget {
           decoration: secondarySection,
           child: Column(
             mainAxisSize: MainAxisSize.min,
-            spacing: 20,
             children: [
               AnalyticsErrorWidget(state.errorMessage),
-              EnergyConsumptionByPhasesTitle(isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,),
+              EnergyConsumptionByPhasesTitle(
+                isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,
+              ),
+              const SizedBox(height: 20),
               Expanded(
                 child: EnergyConsumptionByPhasesChart(
                   energyData: state.chartData,

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

@@ -69,13 +69,18 @@ class PowerClampEnergyDataWidget extends StatelessWidget {
                       PowerClampEnergyStatus(
                         iconPath: Assets.powerActiveIcon,
                         title: 'Active',
-                        value: _valueFromCode('EnergyConsumed', generalDataPoints),
+                        value: _valueFromCode('ActivePower', generalDataPoints),
                         unit: 'W',
                       ),
                       PowerClampEnergyStatus(
                         iconPath: Assets.voltMeterIcon,
                         title: 'Current',
-                        value: _valueFromCode('Current', generalDataPoints),
+                        value: _valueFromCode('Current', generalDataPoints)
+                            .replaceAllMapped(
+                              RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
+                              (Match m) => '${m[1]}.',
+                            )
+                            .replaceAll('.0', ''),
                         unit: 'A',
                       ),
                       PowerClampEnergyStatus(

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

@@ -55,7 +55,7 @@ class PowerClampPhasesDataWidget extends StatelessWidget {
                     iconPath: Assets.powerActiveIcon,
                     title: 'Active Power',
                     value: _valueFromCode(
-                      code: 'ReactivePower$phaseSuffix',
+                      code: 'ActivePower$phaseSuffix',
                       points: phase?.dataPoints,
                     ),
                     unit: 'W',
@@ -125,7 +125,48 @@ class PowerClampPhasesDataWidget extends StatelessWidget {
       (e) => e.code == code,
       orElse: () => DataPoint(value: '--'),
     );
+    final value = element?.value;
+    if (code.contains('Current')) {
+      return _formatCurrentValue(value?.toString());
+    }
+    if (code.contains('PowerFactor')) {
+      return _formatPowerFactor(value?.toString());
+    }
+    if (code.contains('Voltage')) {
+      return _formatVoltage(value?.toString());
+    }
+    return value?.toString() ?? '--';
+  }
 
-    return element?.value.toString() ?? '--';
+  String _formatCurrentValue(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    if (str.length == 1) return '${str[0]}.0';
+    return '${str[0]}.${str.substring(1)}';
+  }
+
+  String _formatPowerFactor(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    final intValue = int.tryParse(str);
+    if (intValue == null) return '--';
+    final doubleValue = intValue / 100;
+    return doubleValue.toStringAsFixed(2);
+  }
+
+  String _formatVoltage(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    if (str.length == 1) return '0.${str[0]}';
+    return '${str.substring(0, str.length - 1)}.${str.substring(str.length - 1)}';
   }
 }

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

@@ -30,7 +30,6 @@ abstract final class FetchOccupancyDataHelper {
 
     loadOccupancyChartData(
       context,
-      communityUuid: communityId,
       spaceUuid: spaceId,
       date: datePickerState.monthlyDate,
     );
@@ -59,16 +58,14 @@ abstract final class FetchOccupancyDataHelper {
 
   static void loadOccupancyChartData(
     BuildContext context, {
-    required String communityUuid,
     required String spaceUuid,
     required DateTime date,
   }) {
     context.read<OccupancyBloc>().add(
           LoadOccupancyEvent(
             GetOccupancyParam(
-              monthDate: '${date.year}-${date.month}',
+              monthDate: '${date.year}-${date.month.toString().padLeft(2, '0')}',
               spaceUuid: spaceUuid,
-              communityUuid: communityUuid,
             ),
           ),
         );

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

@@ -16,10 +16,10 @@ class OccupancyChart extends StatelessWidget {
   Widget build(BuildContext context) {
     return BarChart(
       BarChartData(
-        maxY: 1.0,
+        maxY: 100.0,
         gridData: EnergyManagementChartsHelper.gridData().copyWith(
           checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 0.2,
+          horizontalInterval: 20,
         ),
         borderData: EnergyManagementChartsHelper.borderData(),
         barTouchData: _barTouchData(context),
@@ -33,20 +33,21 @@ class OccupancyChart extends StatelessWidget {
         ),
         barGroups: List.generate(chartData.length, (index) {
           final actual = chartData[index];
+          final occupancyValue = double.parse(actual.occupancy);
           return BarChartGroupData(
             x: index,
             barsSpace: 0,
             groupVertically: true,
             barRods: [
               BarChartRodData(
-                toY: 1.0,
-                fromY: double.parse(actual.occupancy) + 0.025,
+                toY: 100.0,
+                fromY: occupancyValue == 0 ? occupancyValue : occupancyValue + 2.5,
                 color: ColorsManager.graysColor,
                 width: _chartWidth,
                 borderRadius: BorderRadius.circular(10),
               ),
               BarChartRodData(
-                toY: double.parse(actual.occupancy),
+                toY: occupancyValue,
                 color: ColorsManager.vividBlue.withValues(alpha: 0.8),
                 width: _chartWidth,
                 borderRadius: BorderRadius.circular(10),
@@ -88,7 +89,7 @@ class OccupancyChart extends StatelessWidget {
     final data = chartData;
 
     final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
-    final percentage = '${(occupancyValue * 100).toStringAsFixed(0)}%';
+    final percentage = '${(occupancyValue).toStringAsFixed(0)}%';
 
     return BarTooltipItem(
       percentage,
@@ -108,14 +109,14 @@ class OccupancyChart extends StatelessWidget {
     final leftTitles = titlesData.leftTitles.copyWith(
       sideTitles: titlesData.leftTitles.sideTitles.copyWith(
         reservedSize: 70,
-        interval: 0.2,
+        interval: 20,
         getTitlesWidget: (value, meta) => Padding(
           padding: const EdgeInsetsDirectional.only(end: 12),
           child: FittedBox(
             alignment: AlignmentDirectional.centerStart,
             fit: BoxFit.scaleDown,
             child: Text(
-              '${(value * 100).toStringAsFixed(0)}%',
+              '${(value).toStringAsFixed(0)}%',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 12,
                 color: ColorsManager.greyColor,

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

@@ -50,9 +50,6 @@ class OccupancyChartBox extends StatelessWidget {
                           if (spaceTreeState.selectedSpaces.isNotEmpty) {
                             FetchOccupancyDataHelper.loadOccupancyChartData(
                               context,
-                              communityUuid:
-                                  spaceTreeState.selectedCommunities.firstOrNull ??
-                                      '',
                               spaceUuid:
                                   spaceTreeState.selectedSpaces.firstOrNull ?? '',
                               date: value,

lib/pages/analytics/params/get_occupancy_param.dart

@@ -1,19 +1,11 @@
 class GetOccupancyParam {
   final String monthDate;
   final String? spaceUuid;
-  final String communityUuid;
 
   GetOccupancyParam({
     required this.monthDate,
     required this.spaceUuid,
-    required this.communityUuid,
   });
 
-  Map<String, dynamic> toJson() {
-    return {
-      'monthDate': monthDate,
-      'spaceUuid': spaceUuid,
-      'communityUuid': communityUuid,
-    };
-  }
+  Map<String, dynamic> toJson() => {'monthDate': monthDate};
 }

lib/pages/analytics/services/occupacy/fake_occupacy_service.dart

@@ -1,19 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
-import 'package:syncrow_web/pages/analytics/services/occupacy/occupacy_service.dart';
-
-class FakeOccupacyService implements OccupacyService {
-  @override
-  Future<List<Occupacy>> load(GetOccupancyParam param) async {
-    return await Future.delayed(
-      const Duration(seconds: 1),
-      () => List.generate(
-        30,
-        (index) => Occupacy(
-          date: DateTime.now().subtract(Duration(days: index)).toString(),
-          occupancy: ((index / 100)).toString(),
-        ),
-      ),
-    );
-  }
-}

lib/pages/analytics/services/occupacy/remote_occupancy_service.dart

@@ -0,0 +1,32 @@
+import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
+import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
+import 'package:syncrow_web/pages/analytics/services/occupacy/occupacy_service.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+
+final class RemoteOccupancyService implements OccupacyService {
+  const RemoteOccupancyService(this._httpService);
+
+  final HTTPService _httpService;
+
+  @override
+  Future<List<Occupacy>> load(GetOccupancyParam param) async {
+    try {
+      final response = await _httpService.get(
+        path: '/occupancy/duration/space/${param.spaceUuid}',
+        showServerMessage: true,
+        queryParameters: param.toJson(),
+        expectedResponseModel: (data) {
+          final json = data as Map<String, dynamic>? ?? {};
+          final mappedData = json['data'] as List<dynamic>? ?? [];
+          return mappedData.map((e) {
+            final jsonData = e as Map<String, dynamic>;
+            return Occupacy.fromJson(jsonData);
+          }).toList();
+        },
+      );
+      return response;
+    } catch (e) {
+      throw Exception('Failed to load energy consumption per phase: $e');
+    }
+  }
+}

lib/pages/common/custom_table.dart

@@ -63,7 +63,8 @@ class _DynamicTableState extends State<DynamicTable> {
     }
   }
 
-  bool _compareListOfLists(List<List<dynamic>> oldList, List<List<dynamic>> newList) {
+  bool _compareListOfLists(
+      List<List<dynamic>> oldList, List<List<dynamic>> newList) {
     // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
@@ -111,8 +112,8 @@ class _DynamicTableState extends State<DynamicTable> {
         trackVisibility: true,
         child: Scrollbar(
           controller: _horizontalScrollController,
-          thumbVisibility: false,
-          trackVisibility: false,
+          thumbVisibility: true,
+          trackVisibility: true,
           notificationPredicate: (notif) => notif.depth == 1,
           child: SingleChildScrollView(
             controller: _verticalScrollController,
@@ -132,46 +133,60 @@ class _DynamicTableState extends State<DynamicTable> {
                         children: [
                           if (widget.withCheckBox) _buildSelectAllCheckbox(),
                           ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(widget.headers[index], index);
+                            return _buildTableHeaderCell(
+                                widget.headers[index], index);
                           })
                           //...widget.headers.map((header) => _buildTableHeaderCell(header)),
                         ],
                       ),
                     ),
                     widget.isEmpty
-                        ? Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Row(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  Column(
-                                    children: [
-                                      SvgPicture.asset(Assets.emptyTable),
-                                      const SizedBox(
-                                        height: 15,
-                                      ),
-                                      Text(
-                                        widget.tableName == 'AccessManagement' ? 'No Password ' : 'No Devices',
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall!
-                                            .copyWith(color: ColorsManager.grayColor),
-                                      )
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ],
+                        ? SizedBox(
+                            height: widget.size.height * 0.5,
+                            width: widget.size.width,
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Row(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    Column(
+                                      children: [
+                                        SvgPicture.asset(Assets.emptyTable),
+                                        const SizedBox(
+                                          height: 15,
+                                        ),
+                                        Text(
+                                          widget.tableName == 'AccessManagement'
+                                              ? 'No Password '
+                                              : 'No Devices',
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .bodySmall!
+                                              .copyWith(
+                                                  color:
+                                                      ColorsManager.grayColor),
+                                        )
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
                           )
                         : Column(
-                            children: List.generate(widget.data.length, (index) {
+                            children:
+                                List.generate(widget.data.length, (index) {
                               final row = widget.data[index];
                               return Row(
                                 children: [
-                                  if (widget.withCheckBox) _buildRowCheckbox(index, widget.size.height * 0.08),
-                                  ...row.map((cell) => _buildTableCell(cell.toString(), widget.size.height * 0.08)),
+                                  if (widget.withCheckBox)
+                                    _buildRowCheckbox(
+                                        index, widget.size.height * 0.08),
+                                  ...row.map((cell) => _buildTableCell(
+                                      cell.toString(),
+                                      widget.size.height * 0.08)),
                                 ],
                               );
                             }),
@@ -196,7 +211,9 @@ class _DynamicTableState extends State<DynamicTable> {
       ),
       child: Checkbox(
         value: _selectAll,
-        onChanged: widget.withSelectAll && widget.data.isNotEmpty ? _toggleSelectAll : null,
+        onChanged: widget.withSelectAll && widget.data.isNotEmpty
+            ? _toggleSelectAll
+            : null,
       ),
     );
   }
@@ -238,7 +255,9 @@ class _DynamicTableState extends State<DynamicTable> {
         constraints: const BoxConstraints.expand(height: 40),
         alignment: Alignment.centerLeft,
         child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: index == widget.headers.length - 1 ? 12 : 8.0, vertical: 4),
+          padding: EdgeInsets.symmetric(
+              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
+              vertical: 4),
           child: Text(
             title,
             style: context.textTheme.titleSmall!.copyWith(

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

@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/
 import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/two_gang_switch/two_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gateway.dart';
+import 'package:syncrow_web/pages/routines/models/pc/energy_clamp_functions.dart';
 import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
@@ -248,6 +249,8 @@ SOS
       tempIcon = Assets.waterLeakNormal;
     } else if (type == DeviceType.NCPS) {
       tempIcon = Assets.sensors;
+    } else if (type == DeviceType.PC) {
+      tempIcon = Assets.powerClamp;
     } else {
       tempIcon = Assets.logoHorizontal;
     }
@@ -393,6 +396,59 @@ SOS
           BacklightFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
         ];
+      case 'PC':
+        return [
+          TotalEnergyConsumedStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          TotalActivePowerConsumedStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltagePhaseSequenceDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          TotalCurrentStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          FrequencyStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase A
+          EnergyConsumedAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PowerFactorAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase B
+          EnergyConsumedBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PowerFactorBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase C
+          EnergyConsumedCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentCStatusFunction(
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
+          PowerFactorCStatusFunction(
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
+        ];
 
       default:
         return [];
@@ -526,5 +582,6 @@ SOS
     "GD": DeviceType.GarageDoor,
     "WL": DeviceType.WaterLeak,
     "NCPS": DeviceType.NCPS,
+    "PC": DeviceType.PC,
   };
 }

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -97,7 +97,8 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
             children: [
               _buildInfoRow('Space Name:',
                   device.spaces?.firstOrNull?.spaceName ?? 'N/A'),
-              _buildInfoRow('Room:', device.subspace?.subspaceName ?? 'N/A'),
+              _buildInfoRow(
+                  'Sub space:', device.subspace?.subspaceName ?? 'N/A'),
             ],
           ),
           TableRow(

lib/pages/home/bloc/home_bloc.dart

@@ -11,16 +11,11 @@ import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/home_api.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
-  // final Graph graph = Graph()..isTree = true;
-  // final BuchheimWalkerConfiguration builder = BuchheimWalkerConfiguration();
-  // List<Node> sourcesList = [];
-  // List<Node> destinationsList = [];
   UserModel? user;
   String terms = '';
   String policy = '';
@@ -33,22 +28,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     on<ConfirmUserAgreementEvent>(_confirmUserAgreement);
   }
 
-  // void _createNode(CreateNewNode event, Emitter<HomeState> emit) async {
-  //   emit(HomeInitial());
-  //   sourcesList.add(event.sourceNode);
-  //   destinationsList.add(event.destinationNode);
-  //   for (int i = 0; i < sourcesList.length; i++) {
-  //     graph.addEdge(sourcesList[i], destinationsList[i]);
-  //   }
-
-  //   builder
-  //     ..siblingSeparation = (100)
-  //     ..levelSeparation = (150)
-  //     ..subtreeSeparation = (150)
-  //     ..orientation = (BuchheimWalkerConfiguration.ORIENTATION_TOP_BOTTOM);
-  //   emit(HomeUpdateTree(graph: graph, builder: builder));
-  // }
-
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
       var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
@@ -99,16 +78,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-//  static  Future fetchUserInfo() async {
-//     try {
-//       var uuid =
-//           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-//       user = await HomeApi().fetchUserInfo(uuid);
-//     } catch (e) {
-//       return;
-//     }
-//   }
-
   List<HomeItemModel> homeItems = [
     HomeItemModel(
       title: 'Access Management',
@@ -118,7 +87,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
         context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.accessManagementPage);
       },
-      color: null,
+      color: const Color(0xFF0036E6),
     ),
     HomeItemModel(
       title: 'Space Management',
@@ -128,7 +97,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
         context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.spacesManagementPage);
       },
-      color: ColorsManager.primaryColor,
+      color: const Color(0xFF0026A2),
     ),
     HomeItemModel(
       title: 'Devices Management',
@@ -140,12 +109,11 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
             .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.deviceManagementPage);
       },
-      color: ColorsManager.primaryColor,
+      color: const Color(0xFF00165E),
     ),
-
     HomeItemModel(
       title: 'Syncrow Analytics',
-      icon: Assets.devicesIcon,
+      icon: Assets.analyticsIcon,
       active: true,
       onPress: (context) {
         context.read<SpaceTreeBloc>().add(ClearCachedData());
@@ -153,43 +121,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
             .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.analytics);
       },
-      color: ColorsManager.primaryColor,
+      color: const Color(0xFF023DFE),
     ),
-    
-    // HomeItemModel(
-    //   title: 'Move in',
-    //   icon: Assets.moveinIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Construction',
-    //   icon: Assets.constructionIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Energy',
-    //   icon: Assets.energyIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Integrations',
-    //   icon: Assets.integrationsIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Asset',
-    //   icon: Assets.assetIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
   ];
 }

lib/pages/home/view/home_card.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class HomeCard extends StatelessWidget {
   final bool active;
@@ -8,6 +7,7 @@ class HomeCard extends StatelessWidget {
   final int index;
   final String name;
   final Function()? onTap;
+  final Color? color;
   const HomeCard({
     super.key,
     required this.name,
@@ -15,28 +15,16 @@ class HomeCard extends StatelessWidget {
     this.active = false,
     required this.img,
     required this.onTap,
+    required this.color,
   });
   @override
   Widget build(BuildContext context) {
-    // bool evenNumbers = index % 2 == 0;
     return InkWell(
       onTap: active ? onTap : null,
       child: Container(
         padding: const EdgeInsets.only(left: 10, right: 10, bottom: 10),
         decoration: BoxDecoration(
-          color: index == 0 && active
-              ? ColorsManager.blue1.withOpacity(0.9)
-              : index == 1 && active
-                  ? ColorsManager.blue2.withOpacity(0.9)
-                  : index == 2 && active
-                      ? ColorsManager.blue3
-                      : index == 4 && active == false
-                          ? ColorsManager.blue4.withOpacity(0.2)
-                          : index == 7 && active == false
-                              ? ColorsManager.blue4.withOpacity(0.2)
-                              : ColorsManager.blueColor.withOpacity(0.2),
-          // (active ?ColorsManager.blueColor
-          //         : ColorsManager.blueColor.withOpacity(0.2)),
+          color: color,
           borderRadius: BorderRadius.circular(30),
         ),
         child: Column(
@@ -64,15 +52,9 @@ class HomeCard extends StatelessWidget {
             ),
             const SizedBox(height: 10),
             Expanded(
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  SizedBox(
-                    child: SvgPicture.asset(
-                      img,
-                    ),
-                  ),
-                ],
+              child: Align(
+                alignment: AlignmentDirectional.bottomEnd,
+                child: SvgPicture.asset(img),
               ),
             ),
           ],

lib/pages/home/view/home_page_mobile.dart

@@ -50,7 +50,7 @@ class HomeMobilePage extends StatelessWidget {
                         height: size.height * 0.6,
                         width: size.width * 0.68,
                         child: GridView.builder(
-                          itemCount: homeItems.length,
+                          itemCount: homeBloc.homeItems.length,
                           gridDelegate:
                               const SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 2,
@@ -61,7 +61,8 @@ class HomeMobilePage extends StatelessWidget {
                           itemBuilder: (context, index) {
                             return HomeCard(
                               index: index,
-                              active: homeBloc.homeItems[index].active!,
+                              active: true,
+                              color: homeBloc.homeItems[index].color,
                               name:  homeBloc.homeItems[index].title!,
                               img:  homeBloc.homeItems[index].icon!,
                               onTap: () =>
@@ -78,56 +79,4 @@ class HomeMobilePage extends StatelessWidget {
       ),
     );
   }
-
-  final dynamic homeItems = [
-    {
-      'title': 'Access',
-      'icon': Assets.accessIcon,
-      'active': true,
-    },
-    {
-      'title': 'Space\nManagement',
-      'icon': Assets.spaseManagementIcon,
-      'color': ColorsManager.primaryColor,
-      'active': true,
-    },
-    {
-      'title': 'Devices',
-      'icon': Assets.devicesIcon,
-      'active': true,
-    },
-    {
-      'title': 'Syncrow Analytics',
-      'icon': Assets.iconEdit,
-      'active': true,
-    },
-    // {
-    //   'title': 'Move in',
-    //   'icon': Assets.moveinIcon,
-    //   'active': false,
-    // },
-    // {
-    //   'title': 'Construction',
-    //   'icon': Assets.constructionIcon,
-    //   'active': false,
-    // },
-    // {
-    //   'title': 'Energy',
-    //   'icon': Assets.energyIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
-    // },
-    // {
-    //   'title': 'Integrations',
-    //   'icon': Assets.integrationsIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
-    // },
-    // {
-    //   'title': 'Asset',
-    //   'icon': Assets.assetIcon,
-    //   'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
-    //   'active': false,
-    // },
-  ];
 }

lib/pages/home/view/home_page_web.dart

@@ -106,6 +106,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                             ),
                             itemBuilder: (context, index) {
                               return HomeCard(
+                                color: homeBloc.homeItems[index].color,
                                 index: index,
                                 active: homeBloc.homeItems[index].active!,
                                 name: homeBloc.homeItems[index].title!,

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

@@ -26,8 +26,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
         functionCode: event.functionData.functionCode,
         operationName: event.functionData.operationName,
         value: event.functionData.value ?? existingData.value,
-        valueDescription: event.functionData.valueDescription ?? existingData.valueDescription,
+        valueDescription: event.functionData.valueDescription ??
+            existingData.valueDescription,
         condition: event.functionData.condition ?? existingData.condition,
+        step: event.functionData.step ?? existingData.step,
       );
     } else {
       functions.clear();
@@ -59,8 +61,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     );
   }
 
-  FutureOr<void> _onSelectFunction(SelectFunction event, Emitter<FunctionBlocState> emit) {
+  FutureOr<void> _onSelectFunction(
+      SelectFunction event, Emitter<FunctionBlocState> emit) {
     emit(state.copyWith(
-        selectedFunction: event.functionCode, selectedOperationName: event.operationName));
+        selectedFunction: event.functionCode,
+        selectedOperationName: event.operationName));
   }
 }

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

@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_senso
 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';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
@@ -137,6 +138,16 @@ class DeviceDialogHelper {
           device: data['device'],
         );
 
+      case 'PC':
+        return EnergyClampDialog.showEnergyClampFunctionsDialog(
+          context: context,
+          functions: functions,
+          uniqueCustomId: data['uniqueCustomId'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          dialogType: dialogType,
+          device: data['device'],
+        );
+
       default:
         return null;
     }

lib/pages/routines/models/ac/ac_function.dart

@@ -14,6 +14,10 @@ abstract class ACFunction extends DeviceFunction<AcStatusModel> {
     required super.operationName,
     required super.icon,
     required this.type,
+    super.step,
+    super.unit,
+    super.max,
+    super.min,
   });
 
   List<ACOperationalValue> getOperationalValues();
@@ -75,26 +79,24 @@ class ModeFunction extends ACFunction {
 }
 
 class TempSetFunction extends ACFunction {
-  final int min;
-  final int max;
-  final int step;
-
-  TempSetFunction(
-      {required super.deviceId, required super.deviceName, required type})
-      : min = 160,
-        max = 300,
-        step = 1,
-        super(
+  TempSetFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
           code: 'temp_set',
           operationName: 'Set Temperature',
           icon: Assets.assetsTempreture,
-          type: type,
+          min: 200,
+          max: 300,
+          step: 1,
+          unit: "°C",
         );
 
   @override
   List<ACOperationalValue> getOperationalValues() {
     List<ACOperationalValue> values = [];
-    for (int temp = min; temp <= max; temp += step) {
+    for (int temp = min!.toInt(); temp <= max!; temp += step!.toInt()) {
       values.add(ACOperationalValue(
         icon: Assets.assetsTempreture,
         description: "${temp / 10}°C",
@@ -104,7 +106,6 @@ class TempSetFunction extends ACFunction {
     return values;
   }
 }
-
 class LevelFunction extends ACFunction {
   LevelFunction(
       {required super.deviceId, required super.deviceName, required type})
@@ -166,9 +167,10 @@ class ChildLockFunction extends ACFunction {
 }
 
 class CurrentTempFunction extends ACFunction {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
+  final String unit = "°C";
 
   CurrentTempFunction(
       {required super.deviceId, required super.deviceName, required type})
@@ -185,7 +187,7 @@ class CurrentTempFunction extends ACFunction {
   @override
   List<ACOperationalValue> getOperationalValues() {
     List<ACOperationalValue> values = [];
-    for (int temp = min; temp <= max; temp += step) {
+    for (int temp = min.toInt(); temp <= max; temp += step.toInt()) {
       values.add(ACOperationalValue(
         icon: Assets.currentTemp,
         description: "${temp / 10}°C",

lib/pages/routines/models/ceiling_presence_sensor_functions.dart

@@ -6,10 +6,12 @@ class CpsOperationalValue {
   final String description;
   final dynamic value;
 
+
   CpsOperationalValue({
     required this.icon,
     required this.description,
     required this.value,
+
   });
 }
 
@@ -94,9 +96,9 @@ final class CpsSensitivityFunction extends CpsFunctions {
           icon: Assets.sensitivity,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   static const _images = <String>[
     Assets.sensitivityFeature1,
@@ -115,10 +117,10 @@ final class CpsSensitivityFunction extends CpsFunctions {
   @override
   List<CpsOperationalValue> getOperationalValues() {
     final values = <CpsOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min; value <= max; value += step.toInt()) {
       values.add(
         CpsOperationalValue(
-          icon: _images[value],
+          icon: _images[value.toInt()],
           description: '$value',
           value: value,
         ),
@@ -142,9 +144,9 @@ final class CpsMovingSpeedFunction extends CpsFunctions {
           icon: Assets.speedoMeter,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {
@@ -173,9 +175,9 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
           icon: Assets.spatialStaticValue,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {
@@ -204,9 +206,9 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
           icon: Assets.spatialMotionValue,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {
@@ -375,9 +377,9 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
           icon: Assets.presenceJudgementThrshold,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {
@@ -406,9 +408,9 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
           icon: Assets.presenceJudgementThrshold,
         );
 
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {

lib/pages/routines/models/device_functions.dart

@@ -4,6 +4,10 @@ abstract class DeviceFunction<T> {
   final String code;
   final String operationName;
   final String icon;
+  final double? step;
+  final String? unit;
+  final double? max;
+  final double? min;
 
   DeviceFunction({
     required this.deviceId,
@@ -11,6 +15,10 @@ abstract class DeviceFunction<T> {
     required this.code,
     required this.operationName,
     required this.icon,
+    this.step,
+    this.unit,
+    this.max,
+    this.min,
   });
 }
 
@@ -22,6 +30,10 @@ class DeviceFunctionData {
   final dynamic value;
   final String? condition;
   final String? valueDescription;
+  final double? step;
+  final String? unit;
+  final double? max;
+  final double? min;
 
   DeviceFunctionData({
     required this.entityId,
@@ -31,6 +43,10 @@ class DeviceFunctionData {
     required this.value,
     this.condition,
     this.valueDescription,
+    this.step,
+    this.unit,
+    this.max,
+    this.min,
   });
 
   Map<String, dynamic> toJson() {
@@ -42,6 +58,10 @@ class DeviceFunctionData {
       'value': value,
       if (condition != null) 'condition': condition,
       if (valueDescription != null) 'valueDescription': valueDescription,
+      if (step != null) 'step': step,
+      if (unit != null) 'unit': unit,
+      if (max != null) 'max': max,
+      if (min != null) 'min': min,
     };
   }
 
@@ -54,6 +74,10 @@ class DeviceFunctionData {
       value: json['value'],
       condition: json['condition'],
       valueDescription: json['valueDescription'],
+      step: json['step']?.toDouble(),
+      unit: json['unit'],
+      max: json['max']?.toDouble(),
+      min: json['min']?.toDouble(),
     );
   }
 
@@ -68,7 +92,11 @@ class DeviceFunctionData {
         other.operationName == operationName &&
         other.value == value &&
         other.condition == condition &&
-        other.valueDescription == valueDescription;
+        other.valueDescription == valueDescription &&
+        other.step == step &&
+        other.unit == unit &&
+        other.max == max &&
+        other.min == min;
   }
 
   @override
@@ -79,6 +107,34 @@ class DeviceFunctionData {
         operationName.hashCode ^
         value.hashCode ^
         condition.hashCode ^
-        valueDescription.hashCode;
+        valueDescription.hashCode ^
+        step.hashCode ^
+        unit.hashCode ^
+        max.hashCode ^
+        min.hashCode;
+  }
+
+  DeviceFunctionData copyWith({
+    String? entityId,
+    String? functionCode,
+    String? operationName,
+    String? condition,
+    dynamic value,
+    double? step,
+    String? unit,
+    double? max,
+    double? min,
+  }) {
+    return DeviceFunctionData(
+      entityId: entityId ?? this.entityId,
+      functionCode: functionCode ?? this.functionCode,
+      operationName: operationName ?? this.operationName,
+      condition: condition ?? this.condition,
+      value: value ?? this.value,
+      step: step ?? this.step,
+      unit: unit ?? this.unit,
+      max: max ?? this.max,
+      min: min ?? this.min,
+    );
   }
 }

lib/pages/routines/models/flush/flush_functions.dart

@@ -20,12 +20,11 @@ abstract class FlushFunctions
 }
 
 class FlushPresenceDelayFunction extends FlushFunctions {
-  final int min;
   FlushPresenceDelayFunction({
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  })  : min = 0,
+  })  :
         super(
           code: FlushMountedPresenceSensorModel.codePresenceState,
           operationName: 'Presence State',
@@ -50,9 +49,9 @@ class FlushPresenceDelayFunction extends FlushFunctions {
 }
 
 class FlushSensiReduceFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   FlushSensiReduceFunction({
     required super.deviceId,
@@ -80,8 +79,8 @@ class FlushSensiReduceFunction extends FlushFunctions {
 }
 
 class FlushNoneDelayFunction extends FlushFunctions {
-  final int min;
-  final int max;
+  final double min;
+  final double max;
   final String unit;
 
   FlushNoneDelayFunction({
@@ -110,9 +109,9 @@ class FlushNoneDelayFunction extends FlushFunctions {
 }
 
 class FlushIlluminanceFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   FlushIlluminanceFunction({
     required super.deviceId,
@@ -130,7 +129,7 @@ class FlushIlluminanceFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     List<FlushOperationalValue> values = [];
-    for (int lux = min; lux <= max; lux += step) {
+    for (int lux = min.toInt(); lux <= max; lux += step.toInt()) {
       values.add(FlushOperationalValue(
         icon: Assets.IlluminanceIcon,
         description: "$lux Lux",
@@ -142,9 +141,9 @@ class FlushIlluminanceFunction extends FlushFunctions {
 }
 
 class FlushOccurDistReduceFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   FlushOccurDistReduceFunction({
     required super.deviceId,
@@ -173,9 +172,9 @@ class FlushOccurDistReduceFunction extends FlushFunctions {
 
 // ==== then functions ====
 class FlushSensitivityFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   FlushSensitivityFunction({
     required super.deviceId,
@@ -203,9 +202,9 @@ class FlushSensitivityFunction extends FlushFunctions {
 }
 
 class FlushNearDetectionFunction extends FlushFunctions {
-  final int min;
+  final double min;
   final double max;
-  final int step;
+  final double step;
   final String unit;
 
   FlushNearDetectionFunction({
@@ -225,7 +224,7 @@ class FlushNearDetectionFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min.toDouble(); value <= max; value += step) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',
@@ -237,9 +236,9 @@ class FlushNearDetectionFunction extends FlushFunctions {
 }
 
 class FlushMaxDetectDistFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   FlushMaxDetectDistFunction({
@@ -259,7 +258,7 @@ class FlushMaxDetectDistFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min; value <= max; value += step.toInt()) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',
@@ -271,9 +270,9 @@ class FlushMaxDetectDistFunction extends FlushFunctions {
 }
 
 class FlushTargetConfirmTimeFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   FlushTargetConfirmTimeFunction({
@@ -293,7 +292,7 @@ class FlushTargetConfirmTimeFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min.toDouble(); value <= max; value += step) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',
@@ -305,9 +304,9 @@ class FlushTargetConfirmTimeFunction extends FlushFunctions {
 }
 
 class FlushDisappeDelayFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   FlushDisappeDelayFunction({
@@ -327,7 +326,7 @@ class FlushDisappeDelayFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min.toDouble(); value <= max; value += step) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',
@@ -339,9 +338,9 @@ class FlushDisappeDelayFunction extends FlushFunctions {
 }
 
 class FlushIndentLevelFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   FlushIndentLevelFunction({
@@ -361,7 +360,7 @@ class FlushIndentLevelFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min.toDouble(); value <= max; value += step) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',
@@ -373,9 +372,9 @@ class FlushIndentLevelFunction extends FlushFunctions {
 }
 
 class FlushTriggerLevelFunction extends FlushFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   FlushTriggerLevelFunction({
@@ -395,7 +394,7 @@ class FlushTriggerLevelFunction extends FlushFunctions {
   @override
   List<FlushOperationalValue> getOperationalValues() {
     final values = <FlushOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min.toDouble(); value <= max; value += step) {
       values.add(FlushOperationalValue(
         icon: Assets.nobodyTime,
         description: '$value $unit',

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

@@ -0,0 +1,416 @@
+import 'package:syncrow_web/pages/device_managment/power_clamp/models/power_clamp_batch_model.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/pc/enrgy_clamp_operational_value.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+abstract class EnergyClampFunctions extends DeviceFunction<PowerClampModel1> {
+  final String type;
+
+  EnergyClampFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+    super.step,
+    super.unit,
+    super.max,
+    super.min,
+  });
+
+  List<EnergyClampOperationalValue> getOperationalValues();
+}
+
+// General & shared
+class TotalEnergyConsumedStatusFunction extends EnergyClampFunctions {
+  TotalEnergyConsumedStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'EnergyConsumed',
+          operationName: 'Total Energy Consumed',
+          icon: Assets.energyConsumedIcon,
+          min: 0.00,
+          max: 20000000.00,
+          step: 1,
+          unit: "kWh",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class TotalActivePowerConsumedStatusFunction extends EnergyClampFunctions {
+  TotalActivePowerConsumedStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'ActivePower',
+          operationName: 'Total Active Power',
+          icon: Assets.powerActiveIcon,
+          min: -19800000,
+          max: 19800000,
+          step: 0.1,
+          unit: "kW",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class VoltagePhaseSequenceDetectionFunction extends EnergyClampFunctions {
+  VoltagePhaseSequenceDetectionFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'voltage_phase_seq',
+          operationName: 'Voltage phase sequence detection',
+          icon: Assets.voltageIcon,
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '0', value: '0'),
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '1', value: '1'),
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '2', value: '2'),
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '3', value: '3'),
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '4', value: '4'),
+        EnergyClampOperationalValue(
+            icon: Assets.voltageIcon, description: '5', value: '5'),
+      ];
+}
+
+class TotalCurrentStatusFunction extends EnergyClampFunctions {
+  TotalCurrentStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'Current',
+          operationName: 'Total Current',
+          icon: Assets.voltMeterIcon,
+          min: 0.000,
+          max: 9000.000,
+          step: 1,
+          unit: "A",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class FrequencyStatusFunction extends EnergyClampFunctions {
+  FrequencyStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'Frequency',
+          operationName: 'Frequency',
+          icon: Assets.frequencyIcon,
+          min: 0,
+          max: 80,
+          step: 1,
+          unit: "Hz",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+// Phase A
+class EnergyConsumedAStatusFunction extends EnergyClampFunctions {
+  EnergyConsumedAStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'EnergyConsumedA',
+          operationName: 'Energy Consumed A',
+          icon: Assets.energyConsumedIcon,
+          min: 0.00,
+          max: 20000000.00,
+          step: 1,
+          unit: "kWh",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class ActivePowerAStatusFunction extends EnergyClampFunctions {
+  ActivePowerAStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'ActivePowerA',
+          operationName: 'Active Power A',
+          icon: Assets.powerActiveIcon,
+          min: 200,
+          max: 300,
+          step: 1,
+          unit: "kW",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class VoltageAStatusFunction extends EnergyClampFunctions {
+  VoltageAStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'VoltageA',
+          operationName: 'Voltage A',
+          icon: Assets.voltageIcon,
+          min: 0.0,
+          max: 500,
+          step: 1,
+          unit: "V",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class PowerFactorAStatusFunction extends EnergyClampFunctions {
+  PowerFactorAStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'PowerFactorA',
+          operationName: 'Power Factor A',
+          icon: Assets.speedoMeter,
+          min: 0.00,
+          max: 1.00,
+          step: 0.1,
+          unit: "",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class CurrentAStatusFunction extends EnergyClampFunctions {
+  CurrentAStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'CurrentA',
+          operationName: 'Current A',
+          icon: Assets.voltMeterIcon,
+          min: 0.000,
+          max: 3000.000,
+          step: 1,
+          unit: "A",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+// Phase B
+class EnergyConsumedBStatusFunction extends EnergyClampFunctions {
+  EnergyConsumedBStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'EnergyConsumedB',
+          operationName: 'Energy Consumed B',
+          icon: Assets.energyConsumedIcon,
+          min: 0.00,
+          max: 20000000.00,
+          step: 1,
+          unit: "kWh",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class ActivePowerBStatusFunction extends EnergyClampFunctions {
+  ActivePowerBStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'ActivePowerB',
+          operationName: 'Active Power B',
+          icon: Assets.powerActiveIcon,
+          min: -6600000,
+          max: 6600000,
+          step: 1,
+          unit: "kW",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class VoltageBStatusFunction extends EnergyClampFunctions {
+  VoltageBStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'VoltageB',
+          operationName: 'Voltage B',
+          icon: Assets.voltageIcon,
+          min: 0.0,
+          max: 500,
+          step: 1,
+          unit: "V",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class CurrentBStatusFunction extends EnergyClampFunctions {
+  CurrentBStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'CurrentB',
+          operationName: 'Current B',
+          icon: Assets.voltMeterIcon,
+          min: 0.000,
+          max: 3000.000,
+          step: 1,
+          unit: "A",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class PowerFactorBStatusFunction extends EnergyClampFunctions {
+  PowerFactorBStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'PowerFactorB',
+          operationName: 'Power Factor B',
+          icon: Assets.speedoMeter,
+          min: 0.0,
+          max: 1.0,
+          step: 0.1,
+          unit: "",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+// Phase C
+class EnergyConsumedCStatusFunction extends EnergyClampFunctions {
+  EnergyConsumedCStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'EnergyConsumedC',
+          operationName: 'Energy Consumed C',
+          icon: Assets.energyConsumedIcon,
+          min: 0.00,
+          max: 20000000.00,
+          step: 1,
+          unit: "kWh",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class ActivePowerCStatusFunction extends EnergyClampFunctions {
+  ActivePowerCStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'ActivePowerC',
+          operationName: 'Active Power C',
+          icon: Assets.powerActiveIcon,
+          min: -6600000,
+          max: 6600000,
+          step: 1,
+          unit: "kW",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class VoltageCStatusFunction extends EnergyClampFunctions {
+  VoltageCStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'VoltageC',
+          operationName: 'Voltage C',
+          icon: Assets.voltageIcon,
+          min: 0.00,
+          max: 500,
+          step: 0.1,
+          unit: "V",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class CurrentCStatusFunction extends EnergyClampFunctions {
+  CurrentCStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'CurrentC',
+          operationName: 'Current C',
+          icon: Assets.voltMeterIcon,
+          min: 0.000,
+          max: 3000.000,
+          step: 0.1,
+          unit: "A",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}
+
+class PowerFactorCStatusFunction extends EnergyClampFunctions {
+  PowerFactorCStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'PowerFactorC',
+          operationName: 'Power Factor C',
+          icon: Assets.speedoMeter,
+          min: 0.00,
+          max: 1.00,
+          step: 0.1,
+          unit: "",
+        );
+
+  @override
+  List<EnergyClampOperationalValue> getOperationalValues() => [];
+}

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

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

lib/pages/routines/models/water_heater/water_heater_functions.dart

@@ -20,17 +20,16 @@ abstract class WaterHeaterFunctions
 }
 
 class WHRestartStatusFunction extends WaterHeaterFunctions {
-  final int min;
   WHRestartStatusFunction({
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  })  : min = 0,
-        super(
+  }) : super(
           code: 'relay_status',
           operationName: 'Restart Status',
           icon: Assets.refreshStatusIcon,
         );
+       
 
   @override
   List<WaterHeaterOperationalValue> getOperationalValues() {
@@ -55,13 +54,11 @@ class WHRestartStatusFunction extends WaterHeaterFunctions {
 }
 
 class WHSwitchFunction extends WaterHeaterFunctions {
-  final int min;
   WHSwitchFunction({
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  })  : min = 0,
-        super(
+  }) : super(
           code: 'switch_1',
           operationName: 'Switch',
           icon: Assets.assetsAcPower,
@@ -104,12 +101,11 @@ class TimerConfirmTimeFunction extends WaterHeaterFunctions {
 }
 
 class BacklightFunction extends WaterHeaterFunctions {
-  final int min;
   BacklightFunction({
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  })  : min = 0,
+  })  : 
         super(
           code: 'switch_backlight',
           operationName: 'Backlight',

lib/pages/routines/models/wps/wps_functions.dart

@@ -4,7 +4,7 @@ import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.dart
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 abstract class WpsFunctions extends DeviceFunction<WallSensorModel> {
-  final String type; 
+  final String type;
 
   WpsFunctions({
     required super.deviceId,
@@ -13,6 +13,10 @@ abstract class WpsFunctions extends DeviceFunction<WallSensorModel> {
     required super.operationName,
     required super.icon,
     required this.type,
+    super.step,
+    super.unit,
+    super.max,
+    super.min,
   });
 
   List<WpsOperationalValue> getOperationalValues();
@@ -20,9 +24,13 @@ abstract class WpsFunctions extends DeviceFunction<WallSensorModel> {
 
 // For far_detection (75-600cm in 75cm steps)
 class FarDetectionFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  
+  final double min;
+    @override
+  final double max;
+    @override
+  final double step;
+  @override
   final String unit;
 
   FarDetectionFunction(
@@ -41,7 +49,7 @@ class FarDetectionFunction extends WpsFunctions {
   @override
   List<WpsOperationalValue> getOperationalValues() {
     final values = <WpsOperationalValue>[];
-    for (var value = min; value <= max; value += step) {
+    for (var value = min; value <= max; value += step.toInt()) {
       values.add(WpsOperationalValue(
         icon: Assets.currentDistanceIcon,
         description: '$value $unit',
@@ -54,9 +62,9 @@ class FarDetectionFunction extends WpsFunctions {
 
 // For presence_time (0-65535 minutes)
 class PresenceTimeFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
   final String unit;
 
   PresenceTimeFunction(
@@ -86,9 +94,9 @@ class PresenceTimeFunction extends WpsFunctions {
 
 // For motion_sensitivity_value (1-5 levels)
 class MotionSensitivityFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   MotionSensitivityFunction(
       {required super.deviceId, required super.deviceName, required type})
@@ -116,9 +124,9 @@ class MotionSensitivityFunction extends WpsFunctions {
 }
 
 class MotionLessSensitivityFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   MotionLessSensitivityFunction(
       {required super.deviceId, required super.deviceName, required type})
@@ -171,8 +179,8 @@ class IndicatorFunction extends WpsFunctions {
 }
 
 class NoOneTimeFunction extends WpsFunctions {
-  final int min;
-  final int max;
+  final double min;
+  final double max;
   final String unit;
 
   NoOneTimeFunction(
@@ -225,9 +233,9 @@ class PresenceStateFunction extends WpsFunctions {
 }
 
 class CurrentDistanceFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   CurrentDistanceFunction(
       {required super.deviceId, required super.deviceName, required type})
@@ -244,11 +252,10 @@ class CurrentDistanceFunction extends WpsFunctions {
   @override
   List<WpsOperationalValue> getOperationalValues() {
     List<WpsOperationalValue> values = [];
-    for (int cm = min; cm <= max; cm += step) {
+    for (int cm = min.toInt(); cm <= max; cm += step.toInt()) {
       values.add(WpsOperationalValue(
         icon: Assets.assetsTempreture,
         description: "${cm}CM",
-
         value: cm,
       ));
     }
@@ -257,9 +264,9 @@ class CurrentDistanceFunction extends WpsFunctions {
 }
 
 class IlluminanceValueFunction extends WpsFunctions {
-  final int min;
-  final int max;
-  final int step;
+  final double min;
+  final double max;
+  final double step;
 
   IlluminanceValueFunction({
     required super.deviceId,
@@ -277,7 +284,7 @@ class IlluminanceValueFunction extends WpsFunctions {
   @override
   List<WpsOperationalValue> getOperationalValues() {
     List<WpsOperationalValue> values = [];
-    for (int lux = min; lux <= max; lux += step) {
+    for (int lux = min.toInt(); lux <= max; lux += step.toInt()) {
       values.add(WpsOperationalValue(
         icon: Assets.IlluminanceIcon,
         description: "$lux Lux",

lib/pages/routines/widgets/custom_routines_textbox.dart

@@ -0,0 +1,330 @@
+import 'dart:math';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:syncrow_web/pages/routines/widgets/condition_toggle.dart';
+import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class CustomRoutinesTextbox extends StatefulWidget {
+  final String? currentCondition;
+  final String dialogType;
+  final (double, double) sliderRange;
+  final dynamic displayedValue;
+  final dynamic initialValue;
+  final void Function(String condition) onConditionChanged;
+  final void Function(double value) onTextChanged;
+  final String unit;
+  final double dividendOfRange;
+  final double stepIncreaseAmount;
+  final bool withSpecialChar;
+
+  const CustomRoutinesTextbox({
+    required this.dialogType,
+    required this.sliderRange,
+    required this.displayedValue,
+    required this.initialValue,
+    required this.onConditionChanged,
+    required this.onTextChanged,
+    required this.currentCondition,
+    required this.unit,
+    required this.dividendOfRange,
+    required this.stepIncreaseAmount,
+    required this.withSpecialChar,
+    super.key,
+  });
+
+  @override
+  State<CustomRoutinesTextbox> createState() => _CustomRoutinesTextboxState();
+}
+
+class _CustomRoutinesTextboxState extends State<CustomRoutinesTextbox> {
+  late final TextEditingController _controller;
+
+  bool hasError = false;
+  String? errorMessage;
+
+  int getDecimalPlaces(double step) {
+    String stepStr = step.toString();
+    if (stepStr.contains('.')) {
+      List<String> parts = stepStr.split('.');
+      String decimalPart = parts[1];
+      decimalPart = decimalPart.replaceAll(RegExp(r'0+$'), '');
+      return decimalPart.isEmpty ? 0 : decimalPart.length;
+    } else {
+      return 0;
+    }
+  }
+
+  bool _isInitialized = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeController();
+  }
+
+  void _initializeController() {
+    final decimalPlaces = getDecimalPlaces(widget.stepIncreaseAmount);
+    final dynamic initialValue = widget.initialValue;
+    double parsedValue;
+
+    if (initialValue is num) {
+      parsedValue = initialValue.toDouble();
+    } else if (initialValue is String) {
+      parsedValue = double.tryParse(initialValue) ?? widget.sliderRange.$1;
+    } else {
+      parsedValue = widget.sliderRange.$1;
+    }
+
+    _controller = TextEditingController(
+      text: parsedValue.toStringAsFixed(decimalPlaces),
+    );
+    _isInitialized = true;
+  }
+
+  @override
+  void didUpdateWidget(CustomRoutinesTextbox oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (widget.initialValue != oldWidget.initialValue && _isInitialized) {
+      final decimalPlaces = getDecimalPlaces(widget.stepIncreaseAmount);
+      final dynamic initialValue = widget.initialValue;
+      double newValue;
+
+      if (initialValue is num) {
+        newValue = initialValue.toDouble();
+      } else if (initialValue is String) {
+        newValue = double.tryParse(initialValue) ?? widget.sliderRange.$1;
+      } else {
+        newValue = widget.sliderRange.$1;
+      }
+
+      final newValueText = newValue.toStringAsFixed(decimalPlaces);
+      if (_controller.text != newValueText) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          _controller.text = newValueText;
+          _controller.selection =
+              TextSelection.collapsed(offset: _controller.text.length);
+        });
+      }
+    }
+  }
+
+ 
+
+  void _validateInput(String value) {
+    final doubleValue = double.tryParse(value);
+    if (doubleValue == null) {
+      setState(() {
+        errorMessage = "Invalid number";
+        hasError = true;
+      });
+      return;
+    }
+
+    final min = widget.sliderRange.$1;
+    final max = widget.sliderRange.$2;
+
+    if (doubleValue < min) {
+      setState(() {
+        errorMessage = "Value must be at least $min";
+        hasError = true;
+      });
+    } else if (doubleValue > max) {
+      setState(() {
+        errorMessage = "Value must be at most $max";
+        hasError = true;
+      });
+    } else {
+      int decimalPlaces = getDecimalPlaces(widget.stepIncreaseAmount);
+      int factor = pow(10, decimalPlaces).toInt();
+      int scaledStep = (widget.stepIncreaseAmount * factor).round();
+      int scaledValue = (doubleValue * factor).round();
+
+      if (scaledValue % scaledStep != 0) {
+        setState(() {
+          errorMessage = "must be a multiple of ${widget.stepIncreaseAmount}";
+          hasError = true;
+        });
+      } else {
+        setState(() {
+          errorMessage = null;
+          hasError = false;
+        });
+      }
+    }
+  }
+
+
+  void _correctAndUpdateValue(String value) {
+    final doubleValue = double.tryParse(value) ?? 0.0;
+    int decimalPlaces = getDecimalPlaces(widget.stepIncreaseAmount);
+    double rounded = (doubleValue / widget.stepIncreaseAmount).round() *
+        widget.stepIncreaseAmount;
+    rounded = rounded.clamp(widget.sliderRange.$1, widget.sliderRange.$2);
+    rounded = double.parse(rounded.toStringAsFixed(decimalPlaces));
+
+    setState(() {
+      hasError = false;
+      errorMessage = null;
+    });
+
+    _controller.text = rounded.toStringAsFixed(decimalPlaces);
+    _controller.selection = TextSelection.fromPosition(
+      TextPosition(offset: _controller.text.length),
+    );
+    widget.onTextChanged(rounded);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    int decimalPlaces = getDecimalPlaces(widget.stepIncreaseAmount);
+
+    List<TextInputFormatter> formatters = [];
+    if (decimalPlaces == 0) {
+      formatters.add(FilteringTextInputFormatter.digitsOnly);
+    } else {
+      formatters.add(FilteringTextInputFormatter.allow(
+        RegExp(r'^\d*\.?\d{0,' + decimalPlaces.toString() + r'}$'),
+      ));
+    }
+    formatters.add(RangeInputFormatter(
+      min: widget.sliderRange.$1,
+      max: widget.sliderRange.$2,
+    ));
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        if (widget.dialogType == 'IF')
+          ConditionToggle(
+            currentCondition: widget.currentCondition,
+            onChanged: widget.onConditionChanged,
+          ),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 35, vertical: 2),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              Text(
+                'Step: ${widget.stepIncreaseAmount}',
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: ColorsManager.grayColor,
+                  fontSize: 10,
+                  fontWeight: FontWeight.w400,
+                ),
+              ),
+            ],
+          ),
+        ),
+        Center(
+          child: Container(
+            width: 170,
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+            decoration: BoxDecoration(
+              color: const Color(0xFFF8F8F8),
+              borderRadius: BorderRadius.circular(20),
+              border: hasError
+                  ? Border.all(color: Colors.red, width: 1)
+                  : Border.all(
+                      color: ColorsManager.lightGrayBorderColor, width: 1),
+              boxShadow: [
+                BoxShadow(
+                  color: ColorsManager.blackColor.withOpacity(0.05),
+                  blurRadius: 8,
+                  offset: const Offset(0, 4),
+                ),
+              ],
+            ),
+            child: Row(
+              children: [
+                Expanded(
+                  child: TextFormField(
+                    controller: _controller,
+                    style: context.textTheme.bodyLarge?.copyWith(
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                      color: ColorsManager.blackColor,
+                    ),
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [
+                      FilteringTextInputFormatter.allow(
+                        widget.withSpecialChar
+                            ? RegExp(r'^-?\d*\.?\d{0,' +
+                                decimalPlaces.toString() +
+                                r'}$')
+                            : RegExp(r'\d+'),
+                      ),
+                    ],
+                    decoration: const InputDecoration(
+                      border: InputBorder.none,
+                      isDense: true,
+                      contentPadding: EdgeInsets.zero,
+                    ),
+                    onChanged: _validateInput,
+                    onFieldSubmitted: _correctAndUpdateValue,
+                    onTapOutside: (_) =>
+                        _correctAndUpdateValue(_controller.text),
+                  ),
+                ),
+                const SizedBox(width: 12),
+                Text(
+                  widget.unit,
+                  style: context.textTheme.bodyMedium?.copyWith(
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                    color: ColorsManager.vividBlue,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+        if (errorMessage != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 2.0),
+            child: Text(
+              errorMessage!,
+              style: context.textTheme.bodySmall?.copyWith(
+                color: Colors.red,
+                fontSize: 10,
+              ),
+            ),
+          ),
+        const SizedBox(height: 16),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 32),
+          child: Wrap(
+            alignment: WrapAlignment.spaceBetween,
+            direction: Axis.horizontal,
+            children: [
+              Text(
+                'Min. ${widget.sliderRange.$1.toInt()}${widget.unit}',
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: ColorsManager.grayColor,
+                  fontSize: 10,
+                  fontWeight: FontWeight.w400,
+                ),
+              ),
+              const SizedBox(
+                width: 50,
+              ),
+              Text(
+                'Max. ${widget.sliderRange.$2.toInt()}${widget.unit}',
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: ColorsManager.grayColor,
+                  fontSize: 10,
+                  fontWeight: FontWeight.w400,
+                ),
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 16),
+      ],
+    );
+  }
+}

lib/pages/routines/widgets/if_container.dart

@@ -78,9 +78,9 @@ class IfContainer extends StatelessWidget {
                                         'CPS',
                                         'NCPS',
                                         'WH',
+                                        'PC',
                                       ].contains(state.ifItems[index]
                                           ['productType'])) {
-                                      
                                         context.read<RoutineBloc>().add(
                                             AddToIfContainer(
                                                 state.ifItems[index], false));
@@ -137,8 +137,18 @@ class IfContainer extends StatelessWidget {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', 'NCPS','WH']
-                    .contains(mutableData['productType'])) {
+                } else if (![
+                  'AC',
+                  '1G',
+                  '2G',
+                  '3G',
+                  'WPS',
+                  'GW',
+                  'CPS',
+                  'NCPS',
+                  'WH',
+                  'PC',
+                ].contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));

lib/pages/routines/widgets/routine_devices.dart

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

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

@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.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';
@@ -73,29 +74,24 @@ class ACHelper {
                             SizedBox(
                               width: selectedFunction != null ? 320 : 360,
                               child: _buildFunctionsList(
-                                context: context,
-                                acFunctions: acFunctions,
-                                device: device,
-                                onFunctionSelected: (functionCode, operationName) {
-                                  RoutineTapFunctionHelper.onTapFunction(
-                                    context,
-                                    functionCode: functionCode,
-                                    functionOperationName: operationName,
-                                    functionValueDescription:
-                                        selectedFunctionData.valueDescription,
-                                    deviceUuid: device?.uuid,
-                                    codesToAddIntoFunctionsWithDefaultValue: [
-                                      'temp_set',
-                                      'temp_current',
-                                    ],
-                                    defaultValue: functionCode == 'temp_set'
-                                        ? 200
-                                        : functionCode == 'temp_current'
-                                            ? -100
-                                            : 0,
-                                  );
-                                },
-                              ),
+                                  context: context,
+                                  acFunctions: acFunctions,
+                                  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)
@@ -153,7 +149,6 @@ class ACHelper {
     required BuildContext context,
     required List<ACFunction> acFunctions,
     required Function(String, String) onFunctionSelected,
-    required AllDevicesModel? device,
   }) {
     return ListView.separated(
       shrinkWrap: false,
@@ -196,7 +191,6 @@ class ACHelper {
     );
   }
 
-  /// Build value selector for AC functions dialog
   static Widget _buildValueSelector({
     required BuildContext context,
     required String selectedFunction,
@@ -206,24 +200,63 @@ class ACHelper {
     required String operationName,
     bool? removeComparators,
   }) {
-    final initialVal = selectedFunction == 'temp_set' ? 200 : -100;
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
+
     if (selectedFunction == 'temp_set' || selectedFunction == 'temp_current') {
-      final initialValue = selectedFunctionData?.value ?? initialVal;
-      return _buildTemperatureSelector(
-        context: context,
-        initialValue: initialValue,
-        selectCode: selectedFunction,
+      final displayValue =
+          (selectedFunctionData?.value ?? selectedFn.min!) / 10;
+      final minValue = selectedFn.min! / 10;
+      final maxValue = selectedFn.max! / 10;
+
+      return CustomRoutinesTextbox(
+        withSpecialChar: true,
+        dividendOfRange: maxValue,
         currentCondition: selectedFunctionData?.condition,
-        device: device,
-        operationName: operationName,
-        selectedFunctionData: selectedFunctionData,
-        removeComparators: removeComparators,
+        dialogType: selectedFn.type,
+        sliderRange: (minValue, maxValue),
+        displayedValue: displayValue.toString(),
+        initialValue: displayValue,
+        unit: selectedFn.unit!,
+        onConditionChanged: (condition) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: selectedFn.operationName,
+                  condition: condition,
+                  value: (displayValue * 10).round(),
+                  step: selectedFn.step,
+                  unit: selectedFn.unit,
+                  max: selectedFn.max,
+                  min: selectedFn.min,
+                ),
+              ),
+            ),
+        onTextChanged: (value) {
+          final numericValue = double.tryParse(value.toString()) ?? minValue;
+          context.read<FunctionBloc>().add(
+                AddFunction(
+                  functionData: DeviceFunctionData(
+                    entityId: device?.uuid ?? '',
+                    functionCode: selectedFunction,
+                    operationName: selectedFn.operationName,
+                    value: (numericValue * 10).round(),
+                    condition: selectedFunctionData?.condition,
+                    step: selectedFn.step,
+                    unit: selectedFn.unit,
+                    max: selectedFn.max,
+                    min: selectedFn.min,
+                  ),
+                ),
+              );
+        },
+        stepIncreaseAmount: selectedFn.step! / 10,
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    // Rest of your existing code for other value selectors
     final values = selectedFn.getOperationalValues();
-
     return _buildOperationalValuesList(
       context: context,
       values: values,
@@ -235,150 +268,151 @@ class ACHelper {
     );
   }
 
-  /// Build temperature selector for AC functions dialog
-  static Widget _buildTemperatureSelector({
-    required BuildContext context,
-    required dynamic initialValue,
-    required String? currentCondition,
-    required String selectCode,
-    AllDevicesModel? device,
-    required String operationName,
-    DeviceFunctionData? selectedFunctionData,
-    bool? removeComparators,
-  }) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        if (removeComparators != true)
-          _buildConditionToggle(
-            context,
-            currentCondition,
-            selectCode,
-            device,
-            operationName,
-            selectedFunctionData,
-          ),
-        const SizedBox(height: 20),
-        _buildTemperatureDisplay(
-          context,
-          initialValue,
-          device,
-          operationName,
-          selectedFunctionData,
-          selectCode,
-        ),
-        const SizedBox(height: 20),
-        _buildTemperatureSlider(
-          context,
-          initialValue,
-          device,
-          operationName,
-          selectedFunctionData,
-          selectCode,
-        ),
-      ],
-    );
-  }
+  // /// Build temperature selector for AC functions dialog
+  // static Widget _buildTemperatureSelector({
+  //   required BuildContext context,
+  //   required dynamic initialValue,
+  //   required String? currentCondition,
+  //   required String selectCode,
+  //   AllDevicesModel? device,
+  //   required String operationName,
+  //   DeviceFunctionData? selectedFunctionData,
+  //   bool? removeComparators,
+  // }) {
+  //   return Column(
+  //     mainAxisAlignment: MainAxisAlignment.center,
+  //     children: [
+  //       if (removeComparators != true)
+  //         _buildConditionToggle(
+  //           context,
+  //           currentCondition,
+  //           selectCode,
+  //           device,
+  //           operationName,
+  //           selectedFunctionData,
+  //         ),
+  //       const SizedBox(height: 20),
+  //       _buildTemperatureDisplay(
+  //         context,
+  //         initialValue,
+  //         device,
+  //         operationName,
+  //         selectedFunctionData,
+  //         selectCode,
+  //       ),
+  //       const SizedBox(height: 20),
+  //       _buildTemperatureSlider(
+  //         context,
+  //         initialValue,
+  //         device,
+  //         operationName,
+  //         selectedFunctionData,
+  //         selectCode,
+  //       ),
+  //     ],
+  //   );
+  // }
 
   /// Build condition toggle for AC functions dialog
-  static Widget _buildConditionToggle(
-    BuildContext context,
-    String? currentCondition,
-    String selectCode,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
+  // static Widget _buildConditionToggle(
+  //   BuildContext context,
+  //   String? currentCondition,
+  //   String selectCode,
+  //   AllDevicesModel? device,
+  //   String operationName,
+  //   DeviceFunctionData? selectedFunctionData,
 
-    // Function(String) onConditionChanged,
-  ) {
-    final conditions = ["<", "==", ">"];
+  //   // Function(String) onConditionChanged,
+  // ) {
+  //   final conditions = ["<", "==", ">"];
 
-    return ToggleButtons(
-      onPressed: (int index) {
-        context.read<FunctionBloc>().add(
-              AddFunction(
-                functionData: DeviceFunctionData(
-                  entityId: device?.uuid ?? '',
-                  functionCode: selectCode,
-                  operationName: operationName,
-                  condition: conditions[index],
-                  value: selectedFunctionData?.value ?? selectCode == 'temp_set'
-                      ? 200
-                      : -100,
-                  valueDescription: selectedFunctionData?.valueDescription,
-                ),
-              ),
-            );
-      },
-      borderRadius: const BorderRadius.all(Radius.circular(8)),
-      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
-      selectedColor: Colors.white,
-      fillColor: ColorsManager.primaryColorWithOpacity,
-      color: ColorsManager.primaryColorWithOpacity,
-      constraints: const BoxConstraints(
-        minHeight: 40.0,
-        minWidth: 40.0,
-      ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-      children: conditions.map((c) => Text(c)).toList(),
-    );
-  }
+  //   return ToggleButtons(
+  //     onPressed: (int index) {
+  //       context.read<FunctionBloc>().add(
+  //             AddFunction(
+  //               functionData: DeviceFunctionData(
+  //                 entityId: device?.uuid ?? '',
+  //                 functionCode: selectCode,
+  //                 operationName: operationName,
+  //                 condition: conditions[index],
+  //                 value: selectedFunctionData?.value ?? selectCode == 'temp_set'
+  //                     ? 200
+  //                     : -100,
+  //                 valueDescription: selectedFunctionData?.valueDescription,
+  //               ),
+  //             ),
+  //           );
+  //     },
+  //     borderRadius: const BorderRadius.all(Radius.circular(8)),
+  //     selectedBorderColor: ColorsManager.primaryColorWithOpacity,
+  //     selectedColor: Colors.white,
+  //     fillColor: ColorsManager.primaryColorWithOpacity,
+  //     color: ColorsManager.primaryColorWithOpacity,
+  //     constraints: const BoxConstraints(
+  //       minHeight: 40.0,
+  //       minWidth: 40.0,
+  //     ),
+  //     isSelected:
+  //         conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+  //     children: conditions.map((c) => Text(c)).toList(),
+  //   );
+  // }
 
-  /// Build temperature display for AC functions dialog
-  static Widget _buildTemperatureDisplay(
-    BuildContext context,
-    dynamic initialValue,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
-    String selectCode,
-  ) {
-    final initialVal = selectCode == 'temp_set' ? 200 : -100;
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-      decoration: BoxDecoration(
-        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        '${(initialValue ?? initialVal) / 10}°C',
-        style: context.textTheme.headlineMedium!.copyWith(
-          color: ColorsManager.primaryColorWithOpacity,
-        ),
-      ),
-    );
-  }
+  // /// Build temperature display for AC functions dialog
+  // static Widget _buildTemperatureDisplay(
+  //   BuildContext context,
+  //   dynamic initialValue,
+  //   AllDevicesModel? device,
+  //   String operationName,
+  //   DeviceFunctionData? selectedFunctionData,
+  //   String selectCode,
+  // ) {
+  //   final initialVal = selectCode == 'temp_set' ? 200 : -100;
+  //   return Container(
+  //     padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+  //     decoration: BoxDecoration(
+  //       color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
+  //       borderRadius: BorderRadius.circular(10),
+  //     ),
+  //     child: Text(
+  //       '${(initialValue ?? initialVal) / 10}°C',
+  //       style: context.textTheme.headlineMedium!.copyWith(
+  //         color: ColorsManager.primaryColorWithOpacity,
+  //       ),
+  //     ),
+  //   );
+  // }
 
-  static Widget _buildTemperatureSlider(
-    BuildContext context,
-    dynamic initialValue,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
-    String selectCode,
-  ) {
-    return Slider(
-      value: initialValue is int ? initialValue.toDouble() : 200.0,
-      min: selectCode == 'temp_current' ? -100 : 200,
-      max: selectCode == 'temp_current' ? 900 : 300,
-      divisions: 10,
-      label: '${((initialValue ?? 160) / 10).toInt()}°C',
-      onChanged: (value) {
-        context.read<FunctionBloc>().add(
-              AddFunction(
-                functionData: DeviceFunctionData(
-                  entityId: device?.uuid ?? '',
-                  functionCode: selectCode,
-                  operationName: operationName,
-                  value: value,
-                  condition: selectedFunctionData?.condition,
-                  valueDescription: selectedFunctionData?.valueDescription,
-                ),
-              ),
-            );
-      },
-    );
-  }
+  // static Widget _buildTemperatureSlider(
+  //   BuildContext context,
+  //   dynamic initialValue,
+  //   AllDevicesModel? device,
+  //   String operationName,
+  //   DeviceFunctionData? selectedFunctionData,
+  //   String selectCode,
+  // ) {
+  //   return Slider(
+  //     value: initialValue is int ? initialValue.toDouble() : 200.0,
+  //     min: selectCode == 'temp_current' ? -100 : 200,
+  //     max: selectCode == 'temp_current' ? 900 : 300,
+  //     divisions: 10,
+  //     label: '${((initialValue ?? 160) / 10).toInt()}°C',
+  //     onChanged: (value) {
+  //       context.read<FunctionBloc>().add(
+  //             AddFunction(
+  //               functionData: DeviceFunctionData(
+  //                 entityId: device?.uuid ?? '',
+  //                 functionCode: selectCode,
+  //                 operationName: operationName,
+  //                 value: value,
+  //                 condition: selectedFunctionData?.condition,
+  //                 valueDescription: selectedFunctionData?.valueDescription,
+  //               ),
+  //             ),
+  //           );
+  //     },
+  //   );
+  // }
 
   static Widget _buildOperationalValuesList({
     required BuildContext context,
@@ -414,7 +448,9 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -430,7 +466,8 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -41,7 +41,8 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
   void initState() {
     super.initState();
 
-    _cpsFunctions = widget.functions.whereType<CpsFunctions>().where((function) {
+    _cpsFunctions =
+        widget.functions.whereType<CpsFunctions>().where((function) {
       if (widget.dialogType == 'THEN') {
         return function.type == 'THEN' || function.type == 'BOTH';
       }
@@ -149,6 +150,7 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
                     device: widget.device,
                   )
                 : CpsDialogSliderSelector(
+                    step: selectedCpsFunctions.step!,
                     operations: operations,
                     selectedFunction: selectedFunction ?? '',
                     selectedFunctionData: selectedFunctionData,

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

@@ -4,8 +4,8 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart';
-import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
 
 class CpsDialogSliderSelector extends StatelessWidget {
   const CpsDialogSliderSelector({
@@ -16,6 +16,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
     required this.device,
     required this.operationName,
     required this.dialogType,
+    required this.step,
     super.key,
   });
 
@@ -26,13 +27,16 @@ class CpsDialogSliderSelector extends StatelessWidget {
   final AllDevicesModel? device;
   final String operationName;
   final String dialogType;
+  final double step;
 
   @override
   Widget build(BuildContext context) {
-    return SliderValueSelector(
+    return CustomRoutinesTextbox(
+      withSpecialChar: true,
       currentCondition: selectedFunctionData.condition,
       dialogType: dialogType,
-      sliderRange: CpsSliderHelpers.sliderRange(selectedFunctionData.functionCode),
+      sliderRange:
+          CpsSliderHelpers.sliderRange(selectedFunctionData.functionCode),
       displayedValue: CpsSliderHelpers.displayText(
         value: selectedFunctionData.value,
         functionCode: selectedFunctionData.functionCode,
@@ -50,7 +54,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
               ),
             ),
           ),
-      onSliderChanged: (value) => context.read<FunctionBloc>().add(
+      onTextChanged: (value) => context.read<FunctionBloc>().add(
             AddFunction(
               functionData: DeviceFunctionData(
                 entityId: device?.uuid ?? '',
@@ -64,6 +68,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
       dividendOfRange: CpsSliderHelpers.dividendOfRange(
         selectedFunctionData.functionCode,
       ),
+      stepIncreaseAmount: step,
     );
   }
 }

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

@@ -34,30 +34,33 @@ class CpsFunctionsList extends StatelessWidget {
         itemBuilder: (context, index) {
           final function = cpsFunctions[index];
           return RoutineDialogFunctionListTile(
-            iconPath: function.icon,
-            operationName: function.operationName,
-            onTap: () => RoutineTapFunctionHelper.onTapFunction(
-              context,
-              functionCode: function.code,
-              functionOperationName: function.operationName,
-              functionValueDescription: selectedFunctionData?.valueDescription,
-              deviceUuid: device?.uuid,
-              codesToAddIntoFunctionsWithDefaultValue: [
-                'static_max_dis',
-                'presence_reference',
-                'moving_reference',
-                'perceptual_boundary',
-                'moving_boundary',
-                'moving_rigger_time',
-                'moving_static_time',
-                'none_body_time',
-                'moving_max_dis',
-                'moving_range',
-                'presence_range',
-                if (dialogType == "IF") 'sensitivity',
-              ],
-            ),
-          );
+              iconPath: function.icon,
+              operationName: function.operationName,
+              onTap: () {
+                RoutineTapFunctionHelper.onTapFunction(
+                  context,
+                  step: function.step,
+                  functionCode: function.code,
+                  functionOperationName: function.operationName,
+                  functionValueDescription:
+                      selectedFunctionData?.valueDescription,
+                  deviceUuid: device?.uuid,
+                  codesToAddIntoFunctionsWithDefaultValue: [
+                    'static_max_dis',
+                    'presence_reference',
+                    'moving_reference',
+                    'perceptual_boundary',
+                    'moving_boundary',
+                    'moving_rigger_time',
+                    'moving_static_time',
+                    'none_body_time',
+                    'moving_max_dis',
+                    'moving_range',
+                    'presence_range',
+                    if (dialogType == "IF") 'sensitivity',
+                  ],
+                );
+              });
         },
       ),
     );

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.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/models/flush/flush_operational_value.dart';
 
@@ -21,22 +22,20 @@ class FlushOperationalValuesList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return  ListView.builder(
-            padding: const EdgeInsets.all(20),
-            itemCount: values.length,
-            itemBuilder: (context, index) =>
-                _buildValueItem(context, values[index]),
-          );
+    return ListView.builder(
+      padding: const EdgeInsets.all(20),
+      itemCount: values.length,
+      itemBuilder: (context, index) => _buildValueItem(context, values[index]),
+    );
   }
 
-
-
   Widget _buildValueItem(BuildContext context, FlushOperationalValue value) {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
+          SvgPicture.asset(value.icon, width: 25, height: 25),
           Expanded(child: _buildValueDescription(value)),
           _buildValueRadio(context, value),
         ],
@@ -44,9 +43,6 @@ class FlushOperationalValuesList extends StatelessWidget {
     );
   }
 
-
-
-
   Widget _buildValueDescription(FlushOperationalValue value) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 8.0),
@@ -60,6 +56,4 @@ class FlushOperationalValuesList extends StatelessWidget {
         groupValue: selectedValue,
         onChanged: (_) => onSelect(value));
   }
-
-
 }

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

@@ -5,6 +5,7 @@ import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.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/widgets/custom_routines_textbox.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart';
 import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
 
@@ -66,7 +67,8 @@ class FlushValueSelectorWidget extends StatelessWidget {
       if (isDistanceDetection) {
         initialValue = initialValue / 100;
       }
-      return SliderValueSelector(
+      return CustomRoutinesTextbox(
+        withSpecialChar: true,
         currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
@@ -83,7 +85,7 @@ class FlushValueSelectorWidget extends StatelessWidget {
                 ),
               ),
             ),
-        onSliderChanged: (value) {
+        onTextChanged: (value) {
           final roundedValue = _roundToStep(value, stepSize);
           final finalValue =
               isDistanceDetection ? (roundedValue * 100).toInt() : roundedValue;
@@ -102,6 +104,7 @@ class FlushValueSelectorWidget extends StatelessWidget {
         },
         unit: _unit,
         dividendOfRange: stepSize,
+        stepIncreaseAmount: stepSize,
       );
     }
 

lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart

@@ -8,6 +8,7 @@ abstract final class RoutineTapFunctionHelper {
 
   static void onTapFunction(
     BuildContext context, {
+    double? step,
     required String functionCode,
     required String functionOperationName,
     required String? functionValueDescription,

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

@@ -4,11 +4,11 @@ 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/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/helper/duration_format_helper.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.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';
@@ -87,14 +87,15 @@ class OneGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () =>
-                                          RoutineTapFunctionHelper.onTapFunction(
+                                      onTap: () => RoutineTapFunctionHelper
+                                          .onTapFunction(
                                         context,
                                         functionCode: function.code,
                                         functionOperationName:
                                             function.operationName,
                                         functionValueDescription:
-                                            selectedFunctionData.valueDescription,
+                                            selectedFunctionData
+                                                .valueDescription,
                                         deviceUuid: device?.uuid,
                                         codesToAddIntoFunctionsWithDefaultValue: [
                                           'countdown_1',
@@ -108,14 +109,16 @@ class OneGangSwitchHelper {
                               if (selectedFunction != null)
                                 Expanded(
                                   child: _buildValueSelector(
-                                    context: context,
-                                    selectedFunction: selectedFunction,
-                                    selectedFunctionData: selectedFunctionData,
-                                    acFunctions: oneGangFunctions,
-                                    device: device,
-                                    operationName: selectedOperationName ?? '',
-                                    removeComparetors: removeComparetors,
-                                  ),
+                                      context: context,
+                                      selectedFunction: selectedFunction,
+                                      selectedFunctionData:
+                                          selectedFunctionData,
+                                      acFunctions: oneGangFunctions,
+                                      device: device,
+                                      operationName:
+                                          selectedOperationName ?? '',
+                                      removeComparetors: removeComparetors,
+                                      dialogType: dialogType),
                                 ),
                             ],
                           ),
@@ -172,6 +175,7 @@ class OneGangSwitchHelper {
     AllDevicesModel? device,
     required String operationName,
     required bool removeComparetors,
+    required String dialogType,
   }) {
     if (selectedFunction == 'countdown_1') {
       final initialValue = selectedFunctionData?.value ?? 0;
@@ -184,6 +188,7 @@ class OneGangSwitchHelper {
         operationName: operationName,
         selectedFunctionData: selectedFunctionData,
         removeComparetors: removeComparetors,
+        dialogType: dialogType,
       );
     }
     final selectedFn = acFunctions.firstWhere(
@@ -216,93 +221,18 @@ class OneGangSwitchHelper {
     required String operationName,
     DeviceFunctionData? selectedFunctionData,
     required bool removeComparetors,
+    String? dialogType,
   }) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        if (removeComparetors != true)
-          _buildConditionToggle(
-            context,
-            currentCondition,
-            selectCode,
-            device,
-            operationName,
-            selectedFunctionData,
-          ),
-        const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
         _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode, dialogType!),
       ],
     );
   }
 
-  /// Build condition toggle for AC functions dialog
-  static Widget _buildConditionToggle(
-    BuildContext context,
-    String? currentCondition,
-    String selectCode,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
-    // Function(String) onConditionChanged,
-  ) {
-    final conditions = ["<", "==", ">"];
-
-    return ToggleButtons(
-      onPressed: (int index) {
-        context.read<FunctionBloc>().add(
-              AddFunction(
-                functionData: DeviceFunctionData(
-                  entityId: device?.uuid ?? '',
-                  functionCode: selectCode,
-                  operationName: operationName,
-                  condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
-                  valueDescription: selectedFunctionData?.valueDescription,
-                ),
-              ),
-            );
-      },
-      borderRadius: const BorderRadius.all(Radius.circular(8)),
-      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
-      selectedColor: Colors.white,
-      fillColor: ColorsManager.primaryColorWithOpacity,
-      color: ColorsManager.primaryColorWithOpacity,
-      constraints: const BoxConstraints(
-        minHeight: 40.0,
-        minWidth: 40.0,
-      ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-      children: conditions.map((c) => Text(c)).toList(),
-    );
-  }
-
-  /// Build temperature display for AC functions dialog
-  static Widget _buildCountDownDisplay(
-      BuildContext context,
-      dynamic initialValue,
-      AllDevicesModel? device,
-      String operationName,
-      DeviceFunctionData? selectedFunctionData,
-      String selectCode) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-      decoration: BoxDecoration(
-        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        DurationFormatMixin.formatDuration(initialValue?.toInt() ?? 0),
-        style: context.textTheme.headlineMedium!.copyWith(
-          color: ColorsManager.primaryColorWithOpacity,
-        ),
-      ),
-    );
-  }
-
   static Widget _buildCountDownSlider(
     BuildContext context,
     dynamic initialValue,
@@ -310,38 +240,47 @@ class OneGangSwitchHelper {
     String operationName,
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
+    String dialogType,
   ) {
-    const twelveHoursInSeconds = 43200.0;
-    final operationalValues = SwitchOperationalValue(
-      icon: '',
-      description: "sec",
-      value: 0.0,
-      minValue: 0,
-      maxValue: twelveHoursInSeconds,
-      stepValue: 1,
-    );
-    return Slider(
-      value: (initialValue ?? 0).toDouble(),
-      min: operationalValues.minValue?.toDouble() ?? 0.0,
-      max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions:
-          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-                  (operationalValues.stepValue ?? 1))
-              .round(),
-      onChanged: (value) {
+    return CustomRoutinesTextbox(
+      withSpecialChar: false,
+      currentCondition: selectedFunctionData?.condition,
+      dialogType: dialogType,
+      sliderRange: (0, 43200), 
+      displayedValue: (initialValue ?? 0).toString(),
+      initialValue: (initialValue ?? 0).toString(), 
+      onConditionChanged: (condition) {
         context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
                   entityId: device?.uuid ?? '',
                   functionCode: selectCode,
                   operationName: operationName,
-                  value: value,
+                  condition: condition,
+                  value: selectedFunctionData?.value ?? 0,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+      onTextChanged: (value) {
+        final roundedValue = value.round();
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  value: roundedValue,
                   condition: selectedFunctionData?.condition,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
             );
       },
+      unit: 'sec',
+      dividendOfRange: 1,
+      stepIncreaseAmount: 1,
     );
   }
 
@@ -377,7 +316,9 @@ class OneGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -393,7 +334,8 @@ class OneGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -0,0 +1,86 @@
+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/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/pc/enrgy_clamp_operational_value.dart';
+
+class EnergyOperationalValuesList extends StatelessWidget {
+  final List<EnergyClampOperationalValue> values;
+  final dynamic selectedValue;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String selectCode;
+
+  const EnergyOperationalValuesList({
+    required this.values,
+    required this.selectedValue,
+    required this.device,
+    required this.operationName,
+    required this.selectCode,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      padding: const EdgeInsets.all(20),
+      itemCount: values.length,
+      itemBuilder: (context, index) => _buildValueItem(context, values[index]),
+    );
+  }
+
+  Widget _buildValueItem(
+      BuildContext context, EnergyClampOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          _buildValueIcon(context, value),
+          Expanded(child: _buildValueDescription(value)),
+          _buildValueRadio(context, value),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildValueIcon(context, EnergyClampOperationalValue value) {
+    return Column(
+      children: [
+        SvgPicture.asset(value.icon, width: 25, height: 25),
+      ],
+    );
+  }
+
+  Widget _buildValueDescription(EnergyClampOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(value.description),
+    );
+  }
+
+  Widget _buildValueRadio(context, EnergyClampOperationalValue value) {
+    return Radio<dynamic>(
+      value: value.value,
+      groupValue: selectedValue,
+      onChanged: (_) => _selectValue(context, value.value),
+    );
+  }
+
+  void _selectValue(BuildContext context, dynamic value) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              value: value,
+            ),
+          ),
+        );
+  }
+
+
+}

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

@@ -0,0 +1,246 @@
+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/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/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/pc/energy_clamp_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/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_value_selector_widget.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class EnergyClampDialog extends StatefulWidget {
+  final List<DeviceFunction> functions;
+  final AllDevicesModel? device;
+  final List<DeviceFunctionData>? deviceSelectedFunctions;
+  final String? uniqueCustomId;
+  final String? dialogType;
+  final bool removeComparetors;
+
+  const EnergyClampDialog({
+    super.key,
+    required this.functions,
+    this.device,
+    this.deviceSelectedFunctions,
+    this.uniqueCustomId,
+    this.dialogType,
+    this.removeComparetors = false,
+  });
+
+  static Future<Map<String, dynamic>?> showEnergyClampFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String? uniqueCustomId,
+    String? dialogType,
+    bool removeComparetors = false,
+  }) async {
+    return showDialog<Map<String, dynamic>?>(
+      context: context,
+      builder: (context) => EnergyClampDialog(
+        functions: functions,
+        device: device,
+        deviceSelectedFunctions: deviceSelectedFunctions,
+        uniqueCustomId: uniqueCustomId,
+        removeComparetors: removeComparetors,
+        dialogType: dialogType,
+      ),
+    );
+  }
+
+  @override
+  State<EnergyClampDialog> createState() => _EnergyClampDialogState();
+}
+
+class _EnergyClampDialogState extends State<EnergyClampDialog> {
+  late final List<EnergyClampFunctions> _functions;
+
+  @override
+  void initState() {
+    super.initState();
+    _functions =
+        widget.functions.whereType<EnergyClampFunctions>().where((function) {
+      if (widget.dialogType == 'THEN') {
+        return function.type == 'THEN' || function.type == 'BOTH';
+      }
+      return function.type == 'IF' || function.type == 'BOTH';
+    }).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => FunctionBloc()
+        ..add(InitializeFunctions(widget.deviceSelectedFunctions ?? [])),
+      child: _buildDialogContent(),
+    );
+  }
+
+  Widget _buildDialogContent() {
+    return AlertDialog(
+      contentPadding: EdgeInsets.zero,
+      content: BlocBuilder<FunctionBloc, FunctionBlocState>(
+        builder: (context, state) {
+          final selectedFunction = state.selectedFunction;
+          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('Energy Clamp Conditions'),
+                Expanded(child: _buildMainContent(context, state)),
+                _buildDialogFooter(context, state),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        _buildFunctionList(context, state),
+        if (state.selectedFunction != null) _buildValueSelector(context, state),
+      ],
+    );
+  }
+
+  Widget _buildFunctionList(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        physics: const AlwaysScrollableScrollPhysics(),
+        itemCount: _functions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _functions[index];
+          return ListTile(
+            leading: SvgPicture.asset(
+              function.icon,
+              width: 24,
+              height: 24,
+              placeholderBuilder: (context) => const SizedBox(
+                width: 24,
+                height: 24,
+              ),
+            ),
+            title: Text(
+              function.operationName,
+              style: context.textTheme.bodyMedium,
+            ),
+            trailing: const Icon(
+              Icons.arrow_forward_ios,
+              size: 16,
+              color: ColorsManager.textGray,
+            ),
+            onTap: () => RoutineTapFunctionHelper.onTapFunction(
+              context,
+              functionCode: function.code,
+              functionOperationName: function.operationName,
+              functionValueDescription: selectedFunctionData.valueDescription,
+              deviceUuid: widget.device?.uuid,
+              codesToAddIntoFunctionsWithDefaultValue: [
+                'VoltageA',
+                'CurrentA',
+                'ActivePowerA',
+                'PowerFactorA',
+                'ReactivePowerA',
+                'EnergyConsumedA',
+                'VoltageB',
+                'CurrentB',
+                'ActivePowerB',
+                'PowerFactorB',
+                'ReactivePowerB',
+                'EnergyConsumedB',
+                'VoltageC',
+                'CurrentC',
+                'ActivePowerC',
+                'PowerFactorC',
+                'ReactivePowerC',
+                'EnergyConsumedC',
+                'EnergyConsumed',
+                'Current',
+                'ActivePower',
+                'ReactivePower',
+                'Frequency',
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildValueSelector(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction!;
+    final functionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction,
+        operationName: state.selectedOperationName ?? '',
+        value: null,
+      ),
+    );
+
+    return Expanded(
+      child: EnergyValueSelectorWidget(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        functions: _functions,
+        device: widget.device,
+        dialogType: widget.dialogType!,
+        removeComparators: widget.removeComparetors,
+      ),
+    );
+  }
+
+  Widget _buildDialogFooter(BuildContext context, FunctionBlocState state) {
+    return DialogFooter(
+      onCancel: () => Navigator.pop(context),
+      onConfirm: state.addedFunctions.isNotEmpty
+          ? () {
+              context.read<RoutineBloc>().add(
+                    AddFunctionToRoutine(
+                      state.addedFunctions,
+                      widget.uniqueCustomId!,
+                    ),
+                  );
+              Navigator.pop(
+                context,
+                {'deviceId': widget.functions.first.deviceId},
+              );
+            }
+          : null,
+      isConfirmEnabled: state.selectedFunction != null,
+    );
+  }
+}

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

@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/pc/energy_clamp_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/power_clamp_enargy/enargy_operational_values_list.dart';
+
+class EnergyValueSelectorWidget extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final List<EnergyClampFunctions> functions;
+  final AllDevicesModel? device;
+  final String dialogType;
+  final bool removeComparators;
+
+  const EnergyValueSelectorWidget({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.functions,
+    required this.device,
+    required this.dialogType,
+    required this.removeComparators,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedFn =
+        functions.firstWhere((f) => f.code == selectedFunction);
+    final values = selectedFn.getOperationalValues();
+    final step = selectedFn.step ?? 1.0; 
+    final _unit = selectedFn.unit ?? '';
+    final (double, double) sliderRange =
+        (selectedFn.min ?? 0.0, selectedFn.max ?? 100.0);
+
+    if (_isSliderFunction(selectedFunction)) {
+      return CustomRoutinesTextbox(
+        withSpecialChar: false,
+        currentCondition: functionData.condition,
+        dialogType: dialogType,
+        sliderRange: sliderRange,
+        displayedValue: functionData.value,
+        initialValue: functionData.value ?? 0.0,
+        onConditionChanged: (condition) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  condition: condition,
+                  value: functionData.value ?? 0,
+                ),
+              ),
+            ),
+        onTextChanged: (value) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  value: value.toInt(),
+                  condition: functionData.condition,
+                ),
+              ),
+            ),
+        unit: _unit,
+        dividendOfRange: 1,
+        stepIncreaseAmount: step,
+      );
+    }
+
+    return EnergyOperationalValuesList(
+      values: values,
+      selectedValue: functionData.value,
+      device: device,
+      operationName: selectedFn.operationName,
+      selectCode: selectedFunction,
+    );
+  }
+
+  bool _isSliderFunction(String function) =>
+      !['voltage_phase_seq'].contains(function);
+}

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

@@ -4,10 +4,10 @@ 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/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/helper/duration_format_helper.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.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';
@@ -86,20 +86,21 @@ class ThreeGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () =>
-                                          RoutineTapFunctionHelper.onTapFunction(
+                                      onTap: () => RoutineTapFunctionHelper
+                                          .onTapFunction(
                                         context,
                                         functionCode: function.code,
                                         functionOperationName:
                                             function.operationName,
                                         functionValueDescription:
-                                            selectedFunctionData.valueDescription,
+                                            selectedFunctionData
+                                                .valueDescription,
                                         deviceUuid: device?.uuid,
-                                        codesToAddIntoFunctionsWithDefaultValue: [
-                                          'countdown_1',
-                                          'countdown_2',
-                                          'countdown_3',
-                                        ],
+                                        codesToAddIntoFunctionsWithDefaultValue:
+                                            function.code
+                                                    .startsWith('countdown')
+                                                ? [function.code]
+                                                : [],
                                       ),
                                     );
                                   },
@@ -109,14 +110,16 @@ class ThreeGangSwitchHelper {
                               if (selectedFunction != null)
                                 Expanded(
                                   child: _buildValueSelector(
-                                    context: context,
-                                    selectedFunction: selectedFunction,
-                                    selectedFunctionData: selectedFunctionData,
-                                    switchFunctions: switchFunctions,
-                                    device: device,
-                                    operationName: selectedOperationName ?? '',
-                                    removeComparetors: removeComparetors,
-                                  ),
+                                      context: context,
+                                      selectedFunction: selectedFunction,
+                                      selectedFunctionData:
+                                          selectedFunctionData,
+                                      switchFunctions: switchFunctions,
+                                      device: device,
+                                      operationName:
+                                          selectedOperationName ?? '',
+                                      removeComparetors: removeComparetors,
+                                      dialogType: dialogType),
                                 ),
                             ],
                           ),
@@ -133,14 +136,6 @@ class ThreeGangSwitchHelper {
                           onConfirm: state.addedFunctions.isNotEmpty
                               ? () {
                                   /// add the functions to the routine bloc
-                                  // for (var function in state.addedFunctions) {
-                                  //   context.read<RoutineBloc>().add(
-                                  //         AddFunctionToRoutine(
-                                  //           function,
-                                  //           uniqueCustomId,
-                                  //         ),
-                                  //       );
-                                  // }
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
                                           state.addedFunctions,
@@ -173,24 +168,26 @@ class ThreeGangSwitchHelper {
     AllDevicesModel? device,
     required String operationName,
     required bool removeComparetors,
+    required String dialogType,
   }) {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2' ||
         selectedFunction == 'countdown_3') {
       final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
-        context: context,
-        initialValue: initialValue,
-        selectCode: selectedFunction,
-        currentCondition: selectedFunctionData?.condition,
-        device: device,
-        operationName: operationName,
-        selectedFunctionData: selectedFunctionData,
-        removeComparetors: removeComparetors,
-      );
+          context: context,
+          initialValue: initialValue,
+          selectCode: selectedFunction,
+          currentCondition: selectedFunctionData?.condition,
+          device: device,
+          operationName: operationName,
+          selectedFunctionData: selectedFunctionData,
+          removeComparetors: removeComparetors,
+          dialogType: dialogType);
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -213,93 +210,18 @@ class ThreeGangSwitchHelper {
     required String operationName,
     DeviceFunctionData? selectedFunctionData,
     bool? removeComparetors,
+    required String dialogType,
   }) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        if (removeComparetors != true)
-          _buildConditionToggle(
-            context,
-            currentCondition,
-            selectCode,
-            device,
-            operationName,
-            selectedFunctionData,
-          ),
-        const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
         _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode, dialogType),
       ],
     );
   }
 
-  /// Build condition toggle for AC functions dialog
-  static Widget _buildConditionToggle(
-    BuildContext context,
-    String? currentCondition,
-    String selectCode,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
-    // Function(String) onConditionChanged,
-  ) {
-    final conditions = ["<", "==", ">"];
-
-    return ToggleButtons(
-      onPressed: (int index) {
-        context.read<FunctionBloc>().add(
-              AddFunction(
-                functionData: DeviceFunctionData(
-                  entityId: device?.uuid ?? '',
-                  functionCode: selectCode,
-                  operationName: operationName,
-                  condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
-                  valueDescription: selectedFunctionData?.valueDescription,
-                ),
-              ),
-            );
-      },
-      borderRadius: const BorderRadius.all(Radius.circular(8)),
-      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
-      selectedColor: Colors.white,
-      fillColor: ColorsManager.primaryColorWithOpacity,
-      color: ColorsManager.primaryColorWithOpacity,
-      constraints: const BoxConstraints(
-        minHeight: 40.0,
-        minWidth: 40.0,
-      ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-      children: conditions.map((c) => Text(c)).toList(),
-    );
-  }
-
-  /// Build temperature display for AC functions dialog
-  static Widget _buildCountDownDisplay(
-      BuildContext context,
-      dynamic initialValue,
-      AllDevicesModel? device,
-      String operationName,
-      DeviceFunctionData? selectedFunctionData,
-      String selectCode) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-      decoration: BoxDecoration(
-        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        DurationFormatMixin.formatDuration(initialValue?.toInt() ?? 0),
-        style: context.textTheme.headlineMedium!.copyWith(
-          color: ColorsManager.primaryColorWithOpacity,
-        ),
-      ),
-    );
-  }
-
   static Widget _buildCountDownSlider(
     BuildContext context,
     dynamic initialValue,
@@ -307,38 +229,47 @@ class ThreeGangSwitchHelper {
     String operationName,
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
+    String dialogType,
   ) {
-    const twelveHoursInSeconds = 43200.0;
-    final operationalValues = SwitchOperationalValue(
-      icon: '',
-      description: "sec",
-      value: 0.0,
-      minValue: 0,
-      maxValue: twelveHoursInSeconds,
-      stepValue: 1,
-    );
-    return Slider(
-      value: (initialValue ?? 0).toDouble(),
-      min: operationalValues.minValue?.toDouble() ?? 0.0,
-      max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions:
-          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-                  (operationalValues.stepValue ?? 1))
-              .round(),
-      onChanged: (value) {
+    return CustomRoutinesTextbox(
+      withSpecialChar: true,
+      currentCondition: selectedFunctionData?.condition,
+      dialogType: dialogType,
+      sliderRange: (0, 43200),
+      displayedValue: (initialValue ?? 0).toString(),
+      initialValue: (initialValue ?? 0).toString(),
+      onConditionChanged: (condition) {
         context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
                   entityId: device?.uuid ?? '',
                   functionCode: selectCode,
                   operationName: operationName,
-                  value: value,
+                  condition: condition,
+                  value: selectedFunctionData?.value ?? 0,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+      onTextChanged: (value) {
+        final roundedValue = value.round();
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  value: roundedValue,
                   condition: selectedFunctionData?.condition,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
             );
       },
+      unit: 'sec',
+      dividendOfRange: 1,
+      stepIncreaseAmount: 1,
     );
   }
 
@@ -374,7 +305,9 @@ class ThreeGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -390,7 +323,8 @@ class ThreeGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/routines/helper/duration_format_helper.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.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';
@@ -86,14 +87,15 @@ class TwoGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () =>
-                                          RoutineTapFunctionHelper.onTapFunction(
+                                      onTap: () => RoutineTapFunctionHelper
+                                          .onTapFunction(
                                         context,
                                         functionCode: function.code,
                                         functionOperationName:
                                             function.operationName,
                                         functionValueDescription:
-                                            selectedFunctionData.valueDescription,
+                                            selectedFunctionData
+                                                .valueDescription,
                                         deviceUuid: device?.uuid,
                                         codesToAddIntoFunctionsWithDefaultValue: [
                                           'countdown_1',
@@ -115,6 +117,7 @@ class TwoGangSwitchHelper {
                                     device: device,
                                     operationName: selectedOperationName ?? '',
                                     removeComparetors: removeComparetors,
+                                    dialogType: dialogType,
                                   ),
                                 ),
                             ],
@@ -172,22 +175,25 @@ class TwoGangSwitchHelper {
     AllDevicesModel? device,
     required String operationName,
     required bool removeComparetors,
+    required String dialogType,
   }) {
-    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
+    if (selectedFunction == 'countdown_1' ||
+        selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
-        context: context,
-        initialValue: initialValue,
-        selectCode: selectedFunction,
-        currentCondition: selectedFunctionData?.condition,
-        device: device,
-        operationName: operationName,
-        selectedFunctionData: selectedFunctionData,
-        removeComparetors: removeComparetors,
-      );
+          context: context,
+          initialValue: initialValue,
+          selectCode: selectedFunction,
+          currentCondition: selectedFunctionData?.condition,
+          device: device,
+          operationName: operationName,
+          selectedFunctionData: selectedFunctionData,
+          removeComparetors: removeComparetors,
+          dialogType: dialogType);
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -210,25 +216,13 @@ class TwoGangSwitchHelper {
     required String operationName,
     DeviceFunctionData? selectedFunctionData,
     bool? removeComparetors,
+    String? dialogType,
   }) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        if (removeComparetors != true)
-          _buildConditionToggle(
-            context,
-            currentCondition,
-            selectCode,
-            device,
-            operationName,
-            selectedFunctionData,
-          ),
-        const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
-        const SizedBox(height: 20),
         _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+            selectedFunctionData, selectCode, dialogType!),
       ],
     );
   }
@@ -269,7 +263,8 @@ class TwoGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -304,38 +299,48 @@ class TwoGangSwitchHelper {
     String operationName,
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
+    String dialogType,
   ) {
-    const twelveHoursInSeconds = 43200.0;
-    final operationalValues = SwitchOperationalValue(
-      icon: '',
-      description: "sec",
-      value: 0.0,
-      minValue: 0,
-      maxValue: twelveHoursInSeconds,
-      stepValue: 1,
-    );
-    return Slider(
-      value: (initialValue ?? 0).toDouble(),
-      min: operationalValues.minValue?.toDouble() ?? 0.0,
-      max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions:
-          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-                  (operationalValues.stepValue ?? 1))
-              .round(),
-      onChanged: (value) {
+    return CustomRoutinesTextbox(
+      withSpecialChar: true,
+      currentCondition: selectedFunctionData?.condition,
+      dialogType: dialogType,
+      sliderRange: (0, 43200),
+      displayedValue: (initialValue ?? 0).toString(),
+      initialValue: (initialValue ?? 0).toString(),
+      onConditionChanged: (condition) {
         context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
                   entityId: device?.uuid ?? '',
                   functionCode: selectCode,
                   operationName: operationName,
-                  value: value,
+                  condition: condition,
+                  value: selectedFunctionData?.value ?? 0,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+      onTextChanged: (value) {
+        final roundedValue =
+            value.round(); // Round to nearest integer (stepSize 1)
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  value: roundedValue,
                   condition: selectedFunctionData?.condition,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
             );
       },
+      unit: 'sec',
+      dividendOfRange: 1,
+      stepIncreaseAmount: 1,
     );
   }
 
@@ -371,7 +376,9 @@ class TwoGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -387,7 +394,8 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -4,8 +4,8 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart';
-import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
 
 class WpsValueSelectorWidget extends StatelessWidget {
   final String selectedFunction;
@@ -27,11 +27,13 @@ class WpsValueSelectorWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final selectedFn = wpsFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        wpsFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     if (_isSliderFunction(selectedFunction)) {
-      return SliderValueSelector(
+      return CustomRoutinesTextbox(
+        withSpecialChar: true,
         currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
@@ -48,7 +50,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                 ),
               ),
             ),
-        onSliderChanged: (value) => context.read<FunctionBloc>().add(
+        onTextChanged: (value) => context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
                   entityId: device?.uuid ?? '',
@@ -61,6 +63,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
             ),
         unit: _unit,
         dividendOfRange: 1,
+        stepIncreaseAmount: _steps,
       );
     }
 
@@ -99,4 +102,10 @@ class WpsValueSelectorWidget extends StatelessWidget {
         'illuminance_value' => 'Lux',
         _ => '',
       };
+  double get _steps => switch (functionData.functionCode) {
+        'presence_time' => 1,
+        'dis_current' => 1,
+        'illuminance_value' => 1,
+        _ => 1,
+      };
 }

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

@@ -176,6 +176,7 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
         functionData: functionData,
         whFunctions: _waterHeaterFunctions,
         device: widget.device,
+        dialogType: widget.dialogType,
       ),
     );
   }

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

@@ -2,25 +2,24 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/helper/duration_format_helper.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/custom_routines_textbox.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/water_heater/water_heater_operational_values_list.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class WaterHeaterValueSelectorWidget extends StatelessWidget {
   final String selectedFunction;
   final DeviceFunctionData functionData;
   final List<WaterHeaterFunctions> whFunctions;
   final AllDevicesModel? device;
+  final String dialogType;  
 
   const WaterHeaterValueSelectorWidget({
     required this.selectedFunction,
     required this.functionData,
     required this.whFunctions,
     required this.device,
+    required this.dialogType,
     super.key,
   });
 
@@ -39,22 +38,6 @@ class WaterHeaterValueSelectorWidget extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          _buildConditionToggle(
-            context,
-            functionData.condition,
-            selectedFunction,
-            device,
-            selectedFn.operationName,
-            functionData,
-          ),
-          _buildCountDownDisplay(
-            context,
-            functionData.value,
-            device,
-            selectedFn.operationName,
-            functionData,
-            selectedFunction,
-          ),
           _buildCountDownSlider(
             context,
             functionData.value,
@@ -62,6 +45,7 @@ class WaterHeaterValueSelectorWidget extends StatelessWidget {
             selectedFn.operationName,
             functionData,
             selectedFunction,
+            dialogType
           ),
           const SizedBox(height: 10),
         ],
@@ -90,28 +74,6 @@ class WaterHeaterValueSelectorWidget extends StatelessWidget {
     );
   }
 
-  static Widget _buildCountDownDisplay(
-      BuildContext context,
-      dynamic initialValue,
-      AllDevicesModel? device,
-      String operationName,
-      DeviceFunctionData? selectedFunctionData,
-      String selectCode) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-      decoration: BoxDecoration(
-        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        DurationFormatMixin.formatDuration(initialValue?.toInt() ?? 0),
-        style: context.textTheme.headlineMedium!.copyWith(
-          color: ColorsManager.primaryColorWithOpacity,
-        ),
-      ),
-    );
-  }
-
   static Widget _buildCountDownSlider(
     BuildContext context,
     dynamic initialValue,
@@ -119,78 +81,47 @@ class WaterHeaterValueSelectorWidget extends StatelessWidget {
     String operationName,
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
+    String dialogType,
   ) {
-    const twelveHoursInSeconds = 43200.0;
-    final operationalValues = SwitchOperationalValue(
-      icon: '',
-      description: "sec",
-      value: 0.0,
-      minValue: 0,
-      maxValue: twelveHoursInSeconds,
-      stepValue: 1,
-    );
-    return Slider(
-      value: (initialValue ?? 0).toDouble(),
-      min: operationalValues.minValue?.toDouble() ?? 0.0,
-      max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
-                  (operationalValues.minValue ?? 0)) /
-              (operationalValues.stepValue ?? 1))
-          .round(),
-      onChanged: (value) {
+    return CustomRoutinesTextbox(
+      withSpecialChar: false,
+      currentCondition: selectedFunctionData?.condition,
+      dialogType: dialogType,
+      sliderRange: (0, 43200),
+      displayedValue: (initialValue ?? 0).toString(),
+      initialValue: (initialValue ?? 0).toString(),
+      onConditionChanged: (condition) {
         context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
                   entityId: device?.uuid ?? '',
                   functionCode: selectCode,
                   operationName: operationName,
-                  value: value,
+                  value: condition,
+                  condition: condition,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+      onTextChanged: (value) {
+        final roundedValue = value.round();
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  value: roundedValue,
                   condition: selectedFunctionData?.condition,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
             );
       },
-    );
-  }
-
-  static Widget _buildConditionToggle(
-    BuildContext context,
-    String? currentCondition,
-    String selectCode,
-    AllDevicesModel? device,
-    String operationName,
-    DeviceFunctionData? selectedFunctionData,
-  ) {
-    final conditions = ["<", "==", ">"];
-
-    return ToggleButtons(
-      onPressed: (int index) {
-        context.read<FunctionBloc>().add(
-              AddFunction(
-                functionData: DeviceFunctionData(
-                  entityId: device?.uuid ?? '',
-                  functionCode: selectCode,
-                  operationName: operationName,
-                  condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
-                  valueDescription: selectedFunctionData?.valueDescription,
-                ),
-              ),
-            );
-      },
-      borderRadius: const BorderRadius.all(Radius.circular(8)),
-      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
-      selectedColor: Colors.white,
-      fillColor: ColorsManager.primaryColorWithOpacity,
-      color: ColorsManager.primaryColorWithOpacity,
-      constraints: const BoxConstraints(
-        minHeight: 40.0,
-        minWidth: 40.0,
-      ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-      children: conditions.map((c) => Text(c)).toList(),
+      unit: 'sec',
+      dividendOfRange: 1,
+      stepIncreaseAmount: 1,
     );
   }
 }

lib/pages/routines/widgets/then_container.dart

@@ -242,7 +242,8 @@ class ThenContainer extends StatelessWidget {
               'GW',
               'CPS',
               "NCPS",
-              "WH"
+              "WH",
+              'PC',
             ].contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -32,13 +32,13 @@ class VisitorPasswordDialog extends StatelessWidget {
                 .stateDialog(
                     context: context,
                     message: 'Password Created Successfully',
-                    title: 'Send Success',
+                    title: 'Sent Successfully',
                     widgeta: Column(
                       children: [
                         if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty)
                           Column(
                             children: [
-                              const Text('Failed Devises'),
+                              const Text('Failed Devices'),
                               SizedBox(
                                 width: 200,
                                 height: 50,
@@ -63,7 +63,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         if (visitorBloc.passwordStatus!.successOperations.isNotEmpty)
                           Column(
                             children: [
-                              const Text('Success Devises'),
+                              const Text('Success Devices'),
                               SizedBox(
                                 width: 200,
                                 height: 50,
@@ -95,7 +95,7 @@ class VisitorPasswordDialog extends StatelessWidget {
             visitorBloc.stateDialog(
               context: context,
               message: state.message,
-              title: 'Something Wrong',
+              title: 'Something went wrong',
             );
           }
         },

lib/utils/constants/assets.dart

@@ -2,6 +2,7 @@ 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";
@@ -13,13 +14,14 @@ class Assets {
   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 invisiblePassword = "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";
+
   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";
@@ -31,8 +33,7 @@ class Assets {
   static const String emptyTable = "assets/images/empty_table.svg";
 
   // General assets
-  static const String motionlessDetection =
-      "assets/icons/motionless_detection.svg";
+  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";
@@ -69,22 +70,19 @@ class Assets {
       "assets/icons/automation_functions/temp_password_unlock.svg";
   static const String doorlockNormalOpen =
       "assets/icons/automation_functions/doorlock_normal_open.svg";
-  static const String doorbell =
-      "assets/icons/automation_functions/doorbell.svg";
+  static const String doorbell = "assets/icons/automation_functions/doorbell.svg";
   static const String remoteUnlockViaApp =
       "assets/icons/automation_functions/remote_unlock_via_app.svg";
   static const String doubleLock =
       "assets/icons/automation_functions/double_lock.svg";
   static const String selfTestResult =
       "assets/icons/automation_functions/self_test_result.svg";
-  static const String lockAlarm =
-      "assets/icons/automation_functions/lock_alarm.svg";
+  static const String lockAlarm = "assets/icons/automation_functions/lock_alarm.svg";
   static const String presenceState =
       "assets/icons/automation_functions/presence_state.svg";
   static const String currentTemp =
       "assets/icons/automation_functions/current_temp.svg";
-  static const String presence =
-      "assets/icons/automation_functions/presence.svg";
+  static const String presence = "assets/icons/automation_functions/presence.svg";
   static const String residualElectricity =
       "assets/icons/automation_functions/residual_electricity.svg";
   static const String hijackAlarm =
@@ -101,15 +99,12 @@ class Assets {
 
   // Presence Sensor Assets
   static const String sensorMotionIcon = "assets/icons/sensor_motion_ic.svg";
-  static const String sensorPresenceIcon =
-      "assets/icons/sensor_presence_ic.svg";
+  static const String sensorPresenceIcon = "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";
-  static const String presenceRecordIcon =
-      "assets/icons/presence_record_ic.svg";
-  static const String helpDescriptionIcon =
-      "assets/icons/help_description_ic.svg";
+  static const String presenceRecordIcon = "assets/icons/presence_record_ic.svg";
+  static const String helpDescriptionIcon = "assets/icons/help_description_ic.svg";
 
   static const String lightPulp = "assets/icons/light_pulb.svg";
   static const String acDevice = "assets/icons/ac_device.svg";
@@ -159,12 +154,10 @@ class Assets {
   static const String unit = 'assets/icons/unit_icon.svg';
   static const String villa = 'assets/icons/villa_icon.svg';
   static const String iconEdit = 'assets/icons/icon_edit_icon.svg';
-  static const String textFieldSearch =
-      'assets/icons/textfield_search_icon.svg';
+  static const String textFieldSearch = 'assets/icons/textfield_search_icon.svg';
   static const String roundedAddIcon = 'assets/icons/rounded_add_icon.svg';
   static const String addIcon = 'assets/icons/add_icon.svg';
-  static const String smartThermostatIcon =
-      'assets/icons/smart_thermostat_icon.svg';
+  static const String smartThermostatIcon = 'assets/icons/smart_thermostat_icon.svg';
   static const String smartLightIcon = 'assets/icons/smart_light_icon.svg';
   static const String presenceSensor = 'assets/icons/presence_sensor.svg';
   static const String Gang3SwitchIcon = 'assets/icons/3_Gang_switch_icon.svg';
@@ -212,8 +205,7 @@ class Assets {
   //assets/icons/water_leak_normal.svg
   static const String waterLeakNormal = 'assets/icons/water_leak_normal.svg';
   //assets/icons/water_leak_detected.svg
-  static const String waterLeakDetected =
-      'assets/icons/water_leak_detected.svg';
+  static const String waterLeakDetected = 'assets/icons/water_leak_detected.svg';
 
   //assets/icons/automation_records.svg
   static const String automationRecords = 'assets/icons/automation_records.svg';
@@ -284,16 +276,13 @@ class Assets {
       "assets/icons/functions_icons/sensitivity.svg";
   static const String assetsSensitivityOperationIcon =
       "assets/icons/functions_icons/sesitivity_operation_icon.svg";
-  static const String assetsAcPower =
-      "assets/icons/functions_icons/ac_power.svg";
+  static const String assetsAcPower = "assets/icons/functions_icons/ac_power.svg";
   static const String assetsAcPowerOFF =
       "assets/icons/functions_icons/ac_power_off.svg";
   static const String assetsChildLock =
       "assets/icons/functions_icons/child_lock.svg";
-  static const String assetsFreezing =
-      "assets/icons/functions_icons/freezing.svg";
-  static const String assetsFanSpeed =
-      "assets/icons/functions_icons/fan_speed.svg";
+  static const String assetsFreezing = "assets/icons/functions_icons/freezing.svg";
+  static const String assetsFanSpeed = "assets/icons/functions_icons/fan_speed.svg";
   static const String assetsAcCooling =
       "assets/icons/functions_icons/ac_cooling.svg";
   static const String assetsAcHeating =
@@ -302,8 +291,7 @@ class Assets {
       "assets/icons/functions_icons/celsius_degrees.svg";
   static const String assetsTempreture =
       "assets/icons/functions_icons/tempreture.svg";
-  static const String assetsAcFanLow =
-      "assets/icons/functions_icons/ac_fan_low.svg";
+  static const String assetsAcFanLow = "assets/icons/functions_icons/ac_fan_low.svg";
   static const String assetsAcFanMiddle =
       "assets/icons/functions_icons/ac_fan_middle.svg";
   static const String assetsAcFanHigh =
@@ -322,8 +310,7 @@ class Assets {
       "assets/icons/functions_icons/far_detection.svg";
   static const String assetsFarDetectionFunction =
       "assets/icons/functions_icons/far_detection_function.svg";
-  static const String assetsIndicator =
-      "assets/icons/functions_icons/indicator.svg";
+  static const String assetsIndicator = "assets/icons/functions_icons/indicator.svg";
   static const String assetsMotionDetection =
       "assets/icons/functions_icons/motion_detection.svg";
   static const String assetsMotionlessDetection =
@@ -336,8 +323,7 @@ class Assets {
       "assets/icons/functions_icons/master_state.svg";
   static const String assetsSwitchAlarmSound =
       "assets/icons/functions_icons/switch_alarm_sound.svg";
-  static const String assetsResetOff =
-      "assets/icons/functions_icons/reset_off.svg";
+  static const String assetsResetOff = "assets/icons/functions_icons/reset_off.svg";
 
 // Assets for automation_functions
   static const String assetsCardUnlock =
@@ -381,14 +367,12 @@ class Assets {
   static const String activeUser = 'assets/icons/active_user.svg';
   static const String deActiveUser = 'assets/icons/deactive_user.svg';
   static const String invitedIcon = 'assets/icons/invited_icon.svg';
-  static const String rectangleCheckBox =
-      'assets/icons/rectangle_check_box.png';
+  static const String rectangleCheckBox = 'assets/icons/rectangle_check_box.png';
   static const String CheckBoxChecked = 'assets/icons/box_checked.png';
   static const String emptyBox = 'assets/icons/empty_box.png';
   static const String completeProcessIcon =
       'assets/icons/compleate_process_icon.svg';
-  static const String currentProcessIcon =
-      'assets/icons/current_process_icon.svg';
+  static const String currentProcessIcon = 'assets/icons/current_process_icon.svg';
   static const String uncomplete_ProcessIcon =
       'assets/icons/uncompleate_process_icon.svg';
   static const String wrongProcessIcon = 'assets/icons/wrong_process_icon.svg';
@@ -409,11 +393,9 @@ class Assets {
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
-  static const String scenesPlayIconCheck =
-      'assets/icons/scenesPlayIconCheck.png';
+  static const String scenesPlayIconCheck = 'assets/icons/scenesPlayIconCheck.png';
   static const String presenceStateIcon = 'assets/icons/presence_state.svg';
-  static const String currentDistanceIcon =
-      'assets/icons/current_distance_icon.svg';
+  static const String currentDistanceIcon = 'assets/icons/current_distance_icon.svg';
 
   static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg';
   static const String motionDetectionSensitivityIcon =
@@ -436,44 +418,29 @@ class Assets {
   static const String cpsMode4 = 'assets/icons/cps_mode4.svg';
   static const String closeToMotion = 'assets/icons/close_to_motion.svg';
   static const String farAwayMotion = 'assets/icons/far_away_motion.svg';
-  static const String communicationFault =
-      'assets/icons/communication_fault.svg';
+  static const String communicationFault = 'assets/icons/communication_fault.svg';
   static const String radarFault = 'assets/icons/radar_fault.svg';
-  static const String selfTestingSuccess =
-      'assets/icons/self_testing_success.svg';
-  static const String selfTestingFailure =
-      'assets/icons/self_testing_failure.svg';
-  static const String selfTestingTimeout =
-      'assets/icons/self_testing_timeout.svg';
+  static const String selfTestingSuccess = 'assets/icons/self_testing_success.svg';
+  static const String selfTestingFailure = 'assets/icons/self_testing_failure.svg';
+  static const String selfTestingTimeout = 'assets/icons/self_testing_timeout.svg';
   static const String movingSpeed = 'assets/icons/moving_speed.svg';
   static const String boundary = 'assets/icons/boundary.svg';
   static const String motionMeter = 'assets/icons/motion_meter.svg';
-  static const String spatialStaticValue =
-      'assets/icons/spatial_static_value.svg';
-  static const String spatialMotionValue =
-      'assets/icons/spatial_motion_value.svg';
+  static const String spatialStaticValue = 'assets/icons/spatial_static_value.svg';
+  static const String spatialMotionValue = 'assets/icons/spatial_motion_value.svg';
   static const String presenceJudgementThrshold =
       'assets/icons/presence_judgement_threshold.svg';
   static const String spaceType = 'assets/icons/space_type.svg';
   static const String sportsPara = 'assets/icons/sports_para.svg';
-  static const String sensitivityFeature1 =
-      'assets/icons/sensitivity_feature_1.svg';
-  static const String sensitivityFeature2 =
-      'assets/icons/sensitivity_feature_2.svg';
-  static const String sensitivityFeature3 =
-      'assets/icons/sensitivity_feature_3.svg';
-  static const String sensitivityFeature4 =
-      'assets/icons/sensitivity_feature_4.svg';
-  static const String sensitivityFeature5 =
-      'assets/icons/sensitivity_feature_5.svg';
-  static const String sensitivityFeature6 =
-      'assets/icons/sensitivity_feature_6.svg';
-  static const String sensitivityFeature7 =
-      'assets/icons/sensitivity_feature_7.svg';
-  static const String sensitivityFeature8 =
-      'assets/icons/sensitivity_feature_8.svg';
-  static const String sensitivityFeature9 =
-      'assets/icons/sensitivity_feature_9.svg';
+  static const String sensitivityFeature1 = 'assets/icons/sensitivity_feature_1.svg';
+  static const String sensitivityFeature2 = 'assets/icons/sensitivity_feature_2.svg';
+  static const String sensitivityFeature3 = 'assets/icons/sensitivity_feature_3.svg';
+  static const String sensitivityFeature4 = 'assets/icons/sensitivity_feature_4.svg';
+  static const String sensitivityFeature5 = 'assets/icons/sensitivity_feature_5.svg';
+  static const String sensitivityFeature6 = 'assets/icons/sensitivity_feature_6.svg';
+  static const String sensitivityFeature7 = 'assets/icons/sensitivity_feature_7.svg';
+  static const String sensitivityFeature8 = 'assets/icons/sensitivity_feature_8.svg';
+  static const String sensitivityFeature9 = 'assets/icons/sensitivity_feature_9.svg';
   static const String deviceTagIcon = 'assets/icons/device_tag_ic.svg';
   static const String targetConfirmTimeIcon =
       'assets/icons/target_confirm_time_icon.svg';
@@ -481,5 +448,8 @@ class Assets {
   static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg';
   static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg';
   static const String blankCalendar = 'assets/icons/blank_calendar.svg';
-    static const String refreshStatusIcon = 'assets/icons/refresh_status_icon.svg';
+  static const String refreshStatusIcon =
+      'assets/icons/refresh_status_icon.svg';
+  static const String energyConsumedIcon =
+      'assets/icons/energy_consumed_icon.svg';
 }

lib/utils/enum/device_types.dart

@@ -19,6 +19,7 @@ enum DeviceType {
   WaterLeak,
   NCPS,
   DoorSensor,
+  PC,
   Other,
 }
 /*
@@ -59,4 +60,5 @@ Map<String, DeviceType> devicesTypesMap = {
   'GD': DeviceType.GarageDoor,
   'WL': DeviceType.WaterLeak,
   'NCPS': DeviceType.NCPS,
+  'PC': DeviceType.PC,
 };

lib/utils/user_drop_down_menu.dart

@@ -41,13 +41,24 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
               _isDropdownOpen = false;
             });
           },
-          child: Transform.rotate(
-            angle: _isDropdownOpen ? -1.5708 : 1.5708,
-            child: const Icon(
-              Icons.arrow_forward_ios,
-              color: Colors.white,
-              size: 16,
-            ),
+          child: Row(
+            children: [
+              const SizedBox(width: 12),
+              if (widget.user != null)
+                Text(
+                  '${widget.user!.firstName} ${widget.user!.lastName}',
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+              const SizedBox(width: 12),
+              Transform.rotate(
+                angle: _isDropdownOpen ? -1.5708 : 1.5708,
+                child: const Icon(
+                  Icons.arrow_forward_ios,
+                  color: Colors.white,
+                  size: 16,
+                ),
+              ),
+            ],
           ),
         ),
       ],

lib/web_layout/web_app_bar.dart

@@ -92,13 +92,6 @@ class DesktopAppBar extends StatelessWidget {
         if (rightBody != null) rightBody!,
         const SizedBox(width: 24),
         _UserAvatar(),
-        const SizedBox(width: 12),
-        if (user != null)
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style: Theme.of(context).textTheme.bodyLarge,
-          ),
-        const SizedBox(width: 12),
         UserDropdownMenu(user: user),
       ],
     );
@@ -146,14 +139,6 @@ class TabletAppBar extends StatelessWidget {
         if (rightBody != null) rightBody!,
         const SizedBox(width: 16),
         _UserAvatar(),
-        if (user != null) ...[
-          const SizedBox(width: 8),
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style:
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
-          ),
-        ],
         UserDropdownMenu(user: user),
       ],
     );
@@ -215,14 +200,6 @@ class MobileAppBar extends StatelessWidget {
     return Row(
       children: [
         _UserAvatar(),
-        if (user != null) ...[
-          const SizedBox(width: 8),
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style:
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
-          ),
-        ],
         UserDropdownMenu(user: user),
       ],
     );

lib/web_layout/web_scaffold.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/web_layout/web_app_bar.dart';
+
 import 'menu_sidebar.dart';
 
 class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
@@ -28,14 +28,11 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
         SizedBox(
           width: MediaQuery.sizeOf(context).width,
           height: MediaQuery.sizeOf(context).height,
-          child: SvgPicture.asset(
-            Assets.webBackground,
+          child: Image.asset(
+            Assets.webBackgroundPng,
             fit: BoxFit.cover,
           ),
         ),
-        Container(
-          color: Colors.white.withOpacity(0.7),
-        ),
         Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [