From 0c6e4fed80cec7f070a442133bed3e8dc45f98ee Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 4 Jun 2025 15:09:40 +0300 Subject: [PATCH] correctly fetch energy management data using `spaceUuid`. --- .../analytics_energy_management_view.dart | 25 +------------------ ...t_energy_consumption_per_device_param.dart | 2 +- .../get_total_energy_consumption_param.dart | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart b/lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart index ffb09113..f88febcc 100644 --- a/lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart +++ b/lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart @@ -1,34 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_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/energy_consumption_per_device_chart_box.dart'; import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart'; import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart'; -import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; -class AnalyticsEnergyManagementView extends StatefulWidget { +class AnalyticsEnergyManagementView extends StatelessWidget { const AnalyticsEnergyManagementView({super.key}); - @override - State createState() => - _AnalyticsEnergyManagementViewState(); -} - -class _AnalyticsEnergyManagementViewState - extends State { - @override - void initState() { - final spaceTreeBloc = context.read(); - final communityId = spaceTreeBloc.state.selectedCommunities.firstOrNull; - final spaceId = spaceTreeBloc.state.selectedSpaces.firstOrNull; - FetchEnergyManagementDataHelper.loadEnergyManagementData( - context, - communityId: communityId ?? '', - spaceId: spaceId ?? '', - ); - super.initState(); - } - static const _padding = EdgeInsetsDirectional.all(32); @override Widget build(BuildContext context) { diff --git a/lib/pages/analytics/params/get_energy_consumption_per_device_param.dart b/lib/pages/analytics/params/get_energy_consumption_per_device_param.dart index 79d0f2f4..c219893e 100644 --- a/lib/pages/analytics/params/get_energy_consumption_per_device_param.dart +++ b/lib/pages/analytics/params/get_energy_consumption_per_device_param.dart @@ -10,7 +10,7 @@ class GetEnergyConsumptionPerDeviceParam { Map toJson() => { 'monthDate': '${monthDate?.year}-${monthDate?.month.toString().padLeft(2, '0')}', - if (spaceId == null || spaceId == null) 'spaceUuid': spaceId, + if (spaceId != null) 'spaceUuid': spaceId, 'groupByDevice': true, }; } diff --git a/lib/pages/analytics/params/get_total_energy_consumption_param.dart b/lib/pages/analytics/params/get_total_energy_consumption_param.dart index 6428fd30..f5615cca 100644 --- a/lib/pages/analytics/params/get_total_energy_consumption_param.dart +++ b/lib/pages/analytics/params/get_total_energy_consumption_param.dart @@ -11,7 +11,7 @@ class GetTotalEnergyConsumptionParam { return { 'monthDate': '${monthDate?.year}-${monthDate?.month.toString().padLeft(2, '0')}', - if (spaceId == null || spaceId == null) 'spaceUuid': spaceId, + if (spaceId != null) 'spaceUuid': spaceId, 'groupByDevice': false, }; }