ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-10 15:17:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes.

Browse Source
This commit is contained in:
Faris Armoush
2025-05-07 11:55:04 +03:00
parent 303b0236f1
commit 9bbf3e75fa
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart
View File

@ -1,4 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/power_clamp_info/power_clamp_info_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/helpers/fetch_energy_management_data_helper.dart';
import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart'; import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
@ -25,9 +27,21 @@ class AnalyticsCommunitiesSidebar extends StatelessWidget {
FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges( FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
context, context,
); );
FetchEnergyManagementDataHelper.loadPowerClampInfo( context.read<PowerClampInfoBloc>().add(
context, const ClearPowerClampInfoEvent(),
); );
final (selectedCommunities, selectedSpaces) =
FetchEnergyManagementDataHelper
.getSelectedCommunitiesAndSpaces(context);
if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
context.read<PowerClampInfoBloc>().add(
const ClearPowerClampInfoEvent(),
);
} else {
FetchEnergyManagementDataHelper.loadPowerClampInfo(
context,
);
}
} }
}, },
); );

9
lib/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart
View File

@ -41,13 +41,14 @@ class RealtimeDeviceChangesBloc
); );
} }
void _onRealtimeDeviceChangesClosed( Future<void> _onRealtimeDeviceChangesClosed(
RealtimeDeviceChangesClosed event, RealtimeDeviceChangesClosed event,
Emitter<RealtimeDeviceChangesState> emit, Emitter<RealtimeDeviceChangesState> emit,
) async { ) async {
add(const _RealtimeDeviceChangesUpdated([]));
await _subscription?.cancel(); await _subscription?.cancel();
_subscription = null; _subscription = null;
emit(state.copyWith(status: RealtimeDeviceChangesStatus.closed)); emit(const RealtimeDeviceChangesState());
} }
void _onRealtimeDeviceChangesUpdated( void _onRealtimeDeviceChangesUpdated(
@ -72,8 +73,8 @@ class RealtimeDeviceChangesBloc
} }
@override @override
Future<void> close() { Future<void> close() async {
_subscription?.cancel(); await _subscription?.cancel();
return super.close(); return super.close();
} }
} }

2
lib/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_state.dart
View File

@ -1,6 +1,6 @@
part of 'realtime_device_changes_bloc.dart'; part of 'realtime_device_changes_bloc.dart';
enum RealtimeDeviceChangesStatus { initial, loaded, failure, closed } enum RealtimeDeviceChangesStatus { initial, loaded, failure }
final class RealtimeDeviceChangesState extends Equatable { final class RealtimeDeviceChangesState extends Equatable {
const RealtimeDeviceChangesState({ const RealtimeDeviceChangesState({

6
lib/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart
View File

@ -18,7 +18,7 @@ abstract final class FetchEnergyManagementDataHelper {
DateTime? selectedDate, DateTime? selectedDate,
}) { }) {
final (selectedCommunities, selectedSpaces) = final (selectedCommunities, selectedSpaces) =
_getSelectedCommunitiesAndSpaces(context); getSelectedCommunitiesAndSpaces(context);
if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) { if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
clearAllData(context); clearAllData(context);
@ -32,7 +32,7 @@ abstract final class FetchEnergyManagementDataHelper {
} }
static (List<String> selectedCommunities, List<String> selectedSpaces) static (List<String> selectedCommunities, List<String> selectedSpaces)
_getSelectedCommunitiesAndSpaces(BuildContext context) { getSelectedCommunitiesAndSpaces(BuildContext context) {
final spaceTreeState = context.read<SpaceTreeBloc>().state; final spaceTreeState = context.read<SpaceTreeBloc>().state;
final selectedCommunities = spaceTreeState.selectedCommunities; final selectedCommunities = spaceTreeState.selectedCommunities;
final selectedSpaces = spaceTreeState.selectedSpaces; final selectedSpaces = spaceTreeState.selectedSpaces;
@ -58,7 +58,7 @@ abstract final class FetchEnergyManagementDataHelper {
DateTime? selectedDate, DateTime? selectedDate,
}) { }) {
final (selectedCommunities, selectedSpaces) = final (selectedCommunities, selectedSpaces) =
_getSelectedCommunitiesAndSpaces(context); getSelectedCommunitiesAndSpaces(context);
final param = GetTotalEnergyConsumptionParam( final param = GetTotalEnergyConsumptionParam(
spaceId: selectedCommunities.firstOrNull, spaceId: selectedCommunities.firstOrNull,