doesnt fetch devices on date change.

<!--
  Thanks for contributing!

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

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

## Description

analytics hotfixes.

## Type of Change

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

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

lib/pages/analytics/models/range_of_aqi.dart

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/utils/constants/assets.dart

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