Add deviceName field to FailedOperation and SuccessOperation models

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

@@ -18,11 +18,7 @@ abstract final class RangeOfAqiChartsHelper {
     (ColorsManager.hazardousPurple, 'Hazardous'),
   ];
 
-  static FlTitlesData titlesData(
+  static FlTitlesData titlesData(BuildContext context, List<RangeOfAqi> data) {
-    BuildContext context,
-    List<RangeOfAqi> data, {
-    double leftSideInterval = 50,
-  }) {
     final titlesData = EnergyManagementChartsHelper.titlesData(context);
     return titlesData.copyWith(
       bottomTitles: titlesData.bottomTitles.copyWith(
@@ -43,11 +39,11 @@ abstract final class RangeOfAqiChartsHelper {
       leftTitles: titlesData.leftTitles.copyWith(
         sideTitles: titlesData.leftTitles.sideTitles.copyWith(
           reservedSize: 70,
-          interval: leftSideInterval,
+          interval: 50,
           maxIncluded: false,
           minIncluded: true,
           getTitlesWidget: (value, meta) {
-            final text = value.toInt().toString();
+            final text = value >= 300 ? '301+' : value.toInt().toString();
             return Padding(
               padding: const EdgeInsetsDirectional.only(end: 12),
               child: FittedBox(

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

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -150,7 +149,6 @@ class AqiDistributionChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
-      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
         showTitles: chartData.isNotEmpty,
         getTitlesWidget: (value, _) => FittedBox(

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

@@ -2,18 +2,15 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class RangeOfAqiChart extends StatelessWidget {
   final List<RangeOfAqi> chartData;
-  final AqiType selectedAqiType;
 
   const RangeOfAqiChart({
     super.key,
     required this.chartData,
-    required this.selectedAqiType,
   });
 
   List<(List<double> values, Color color, Color? dotColor)> get _lines {
@@ -48,34 +45,15 @@ class RangeOfAqiChart extends StatelessWidget {
     ];
   }
 
-  (double maxY, double interval) get _maxYForAqiType {
-    const aqiMaxValues = <AqiType, (double maxY, double interval)>{
-      AqiType.aqi: (401, 100),
-      AqiType.pm25: (351, 50),
-      AqiType.pm10: (501, 100),
-      AqiType.hcho: (301, 50),
-      AqiType.tvoc: (501, 50),
-      AqiType.co2: (1251, 250),
-    };
-
-    return aqiMaxValues[selectedAqiType]!;
-  }
-
   @override
   Widget build(BuildContext context) {
     return LineChart(
       LineChartData(
         minY: 0,
-        maxY: _maxYForAqiType.$1,
+        maxY: 301,
         clipData: const FlClipData.vertical(),
-        gridData: EnergyManagementChartsHelper.gridData(
+        gridData: EnergyManagementChartsHelper.gridData(horizontalInterval: 50),
-          horizontalInterval: _maxYForAqiType.$2,
+        titlesData: RangeOfAqiChartsHelper.titlesData(context, chartData),
-        ),
-        titlesData: RangeOfAqiChartsHelper.titlesData(
-          context,
-          chartData,
-          leftSideInterval: _maxYForAqiType.$2,
-        ),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: RangeOfAqiChartsHelper.lineTouchData(chartData),
         betweenBarsData: [

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

@@ -32,12 +32,7 @@ class RangeOfAqiChartBox extends StatelessWidget {
               const SizedBox(height: 10),
               const Divider(),
               const SizedBox(height: 20),
-              Expanded(
+              Expanded(child: RangeOfAqiChart(chartData: state.filteredRangeOfAqi)),
-                child: RangeOfAqiChart(
-                  chartData: state.filteredRangeOfAqi,
-                  selectedAqiType: state.selectedAqiType,
-                ),
-              ),
             ],
           ),
         );

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

@@ -1,7 +1,6 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/helpers/format_number_to_kwh.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -16,7 +15,6 @@ abstract final class EnergyManagementChartsHelper {
     return FlTitlesData(
       show: true,
       bottomTitles: AxisTitles(
-        axisNameWidget: const ChartsXAxisTitle(),
         drawBelowEverything: true,
         sideTitles: SideTitles(
           interval: 1,
@@ -64,12 +62,17 @@ abstract final class EnergyManagementChartsHelper {
     );
   }
 
-  static String getToolTipLabel(double value) => value.formatNumberToKwh;
+  static String getToolTipLabel(num month, double value) {
+    final monthLabel = month.toString();
+    final valueLabel = value.formatNumberToKwh;
+    final labels = [monthLabel, valueLabel];
+    return labels.where((element) => element.isNotEmpty).join(', ');
+  }
 
   static List<LineTooltipItem?> getTooltipItems(List<LineBarSpot> touchedSpots) {
     return touchedSpots.map((spot) {
       return LineTooltipItem(
-        getToolTipLabel(spot.y),
+        getToolTipLabel(spot.x, spot.y),
         const TextStyle(
           color: ColorsManager.textPrimaryColor,
           fontWeight: FontWeight.w600,

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

@@ -37,7 +37,7 @@ class EnergyConsumptionPerDeviceChartBox extends StatelessWidget {
                       fit: BoxFit.scaleDown,
                       alignment: AlignmentDirectional.centerStart,
                       child: ChartTitle(
-                        title: Text('Device energy consumed'),
+                        title: Text('Energy Consumption per Device'),
                       ),
                     ),
                   ),

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

@@ -32,7 +32,7 @@ class TotalEnergyConsumptionChartBox extends StatelessWidget {
                   child: FittedBox(
                     alignment: AlignmentDirectional.centerStart,
                     fit: BoxFit.scaleDown,
-                    child: ChartTitle(title: Text('Space energy consumed')),
+                    child: ChartTitle(title: Text('Total Energy Consumption')),
                   ),
                 ),
                 const Spacer(flex: 4),

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

@@ -39,7 +39,7 @@ class HeatMapTooltip extends StatelessWidget {
             ),
             const Divider(height: 2, thickness: 1),
             Text(
-              'Occupancy detected: $value',
+              '$value Occupants',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 10,
                 fontWeight: FontWeight.w500,

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

@@ -2,7 +2,6 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
-import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -89,8 +88,8 @@ class OccupancyChart extends StatelessWidget {
   }) {
     final data = chartData;
 
-    final occupancyValue = double.parse(data[group.x].occupancy);
+    final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
-    final percentage = '${occupancyValue.toStringAsFixed(0)}%';
+    final percentage = '${(occupancyValue).toStringAsFixed(0)}%';
 
     return BarTooltipItem(
       percentage,
@@ -117,7 +116,7 @@ class OccupancyChart extends StatelessWidget {
             alignment: AlignmentDirectional.centerStart,
             fit: BoxFit.scaleDown,
             child: Text(
-              '${value.toStringAsFixed(0)}%',
+              '${(value).toStringAsFixed(0)}%',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 12,
                 color: ColorsManager.greyColor,
@@ -129,7 +128,6 @@ class OccupancyChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
-      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
         showTitles: true,
         getTitlesWidget: (value, _) => FittedBox(

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

@@ -23,7 +23,7 @@ class OccupancyEndSideBar extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              const AnalyticsSidebarHeader(title: 'Presence Sensor'),
+              const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
               Expanded(
                 child: SizedBox(
                   // height: MediaQuery.sizeOf(context).height * 0.2,

lib/pages/analytics/widgets/charts_x_axis_title.dart

@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class ChartsXAxisTitle extends StatelessWidget {
-  const ChartsXAxisTitle({
-    this.label = 'Day of month',
-    super.key,
-  });
-
-  final String label;
-
-  @override
-  Widget build(BuildContext context) {
-    return Text(
-      label,
-      style: context.textTheme.bodySmall?.copyWith(
-        color: ColorsManager.lightGreyColor,
-        fontSize: 8,
-      ),
-    );
-  }
-}

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -45,8 +45,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   ) async {
     emit(AcsLoadingState());
     try {
-      final status =
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
       if (deviceStatus.countdown1 != 0) {
         final totalMinutes = deviceStatus.countdown1 * 6;
@@ -69,13 +68,12 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+  void _listenToChanges(deviceId) {
-
-  void _listenToChanges(String deviceId) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      _deviceStatusSubscription =
+      final stream = ref.onValue;
-          ref.onValue.listen((DatabaseEvent event) async {
+
+      stream.listen((DatabaseEvent event) async {
         if (event.snapshot.value == null) return;
 
         Map<dynamic, dynamic> usersMap =
@@ -84,14 +82,10 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         List<Status> statusList = [];
 
         usersMap['status'].forEach((element) {
-          statusList
+          statusList.add(Status(code: element['code'], value: element['value']));
-              .add(Status(code: element['code'], value: element['value']));
         });
 
-        deviceStatus =
+        deviceStatus = AcStatusModel.fromJson(usersMap['productUuid'], statusList);
-            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
-        print('Device status updated: ${deviceStatus.acSwitch}');
-
         if (!isClosed) {
           add(AcStatusUpdated(deviceStatus));
         }
@@ -112,14 +106,15 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     Emitter<AcsState> emit,
   ) async {
     emit(AcsLoadingState());
+    _updateDeviceFunctionFromCode(event.code, event.value);
+    emit(ACStatusLoaded(status: deviceStatus));
 
     try {
       final success = await controlDeviceService.controlDevice(
         deviceUuid: event.deviceId,
         status: Status(code: event.code, value: event.value),
       );
-      _updateDeviceFunctionFromCode(event.code, event.value);
+
-      emit(ACStatusLoaded(status: deviceStatus));
       if (!success) {
         emit(const AcsFailedState(error: 'Failed to control device'));
       }
@@ -134,10 +129,8 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   ) async {
     emit(AcsLoadingState());
     try {
-      final status =
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus = AcStatusModel.fromJson(event.devicesIds.first, status.status);
-      deviceStatus =
-          AcStatusModel.fromJson(event.devicesIds.first, status.status);
       emit(ACStatusLoaded(status: deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
@@ -300,17 +293,13 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         totalSeconds--;
         scheduledHours = totalSeconds ~/ 3600;
         scheduledMinutes = (totalSeconds % 3600) ~/ 60;
-        if (!isClosed) {
+        add(UpdateTimerEvent());
-          add(UpdateTimerEvent());
-        }
       } else {
         _countdownTimer?.cancel();
         timerActive = false;
         scheduledHours = 0;
         scheduledMinutes = 0;
-        if (!isClosed) {
+        add(TimerCompletedEvent());
-          add(TimerCompletedEvent());
-        }
       }
     });
   }
@@ -337,9 +326,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       _startCountdownTimer(
         emit,
       );
-      if (!isClosed) {
+      add(UpdateTimerEvent());
-        add(UpdateTimerEvent());
-      }
     }
   }
 
@@ -383,8 +370,6 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   @override
   Future<void> close() {
     add(OnClose());
-    _countdownTimer?.cancel();
-    _deviceStatusSubscription?.cancel();
     return super.close();
   }
 }

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -289,6 +289,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
+      emit(state.copyWith(selectedSpaces: updatedSelectedSpaces));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -444,12 +445,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   List<String> _getThePathToChild(String communityId, String selectedSpaceId) {
     List<String> ids = [];
-    final communityDataSource =
+    for (var community in state.communityList) {
-        state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
-    for (final community in communityDataSource) {
       if (community.uuid == communityId) {
-        for (final space in community.spaces) {
+        for (var space in community.spaces) {
-          final list = <String>[];
+          List<String> list = [];
           list.add(space.uuid!);
           ids = _getAllParentsIds(space, selectedSpaceId, List.from(list));
           if (ids.isNotEmpty) {

lib/pages/visitor_password/model/failed_operation.dart

@@ -2,11 +2,13 @@ class FailedOperation {
   final bool success;
   final dynamic deviceUuid;
   final dynamic error;
+  final String deviceName;
 
   FailedOperation({
     required this.success,
     required this.deviceUuid,
     required this.error,
+    required this.deviceName,
   });
 
   factory FailedOperation.fromJson(Map<String, dynamic> json) {
@@ -14,6 +16,7 @@ class FailedOperation {
       success: json['success'],
       deviceUuid: json['deviceUuid'],
       error: json['error'],
+      deviceName: json['deviceName'] as String? ?? '',
     );
   }
 
@@ -22,21 +25,22 @@ class FailedOperation {
       'success': success,
       'deviceUuid': deviceUuid,
       'error': error,
+      'deviceName': deviceName,
     };
   }
 }
 
-
-
 class SuccessOperation {
   final bool success;
   // final Result result;
   final String deviceUuid;
+  final String deviceName;
 
   SuccessOperation({
     required this.success,
     // required this.result,
     required this.deviceUuid,
+    required this.deviceName,
   });
 
   factory SuccessOperation.fromJson(Map<String, dynamic> json) {
@@ -44,6 +48,7 @@ class SuccessOperation {
       success: json['success'],
       // result: Result.fromJson(json['result']),
       deviceUuid: json['deviceUuid'],
+      deviceName: json['deviceName'] as String? ?? '',
     );
   }
 
@@ -52,6 +57,7 @@ class SuccessOperation {
       'success': success,
       // 'result': result.toJson(),
       'deviceUuid': deviceUuid,
+      'deviceName': deviceName,
     };
   }
 }
@@ -92,8 +98,6 @@ class SuccessOperation {
 //   }
 // }
 
-
-
 class PasswordStatus {
   final List<SuccessOperation> successOperations;
   final List<FailedOperation> failedOperations;
@@ -121,4 +125,3 @@ class PasswordStatus {
     };
   }
 }
-

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -63,7 +63,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           child: Text(visitorBloc
                                               .passwordStatus!
                                               .failedOperations[index]
-                                              .deviceUuid)),
+                                              .deviceName)),
                                     );
                                   },
                                 ),
@@ -92,7 +92,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           child: Text(visitorBloc
                                               .passwordStatus!
                                               .successOperations[index]
-                                              .deviceUuid)),
+                                              .deviceName)),
                                     );
                                   },
                                 ),