From 31cc2105607b29d3611cfe606e9879533548400f Mon Sep 17 00:00:00 2001 From: mohammad Date: Wed, 15 Jan 2025 17:55:07 +0300 Subject: [PATCH] Fitch report Data --- .../devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart | 6 +++--- .../devices/bloc/ceiling_bloc/ceiling_sensor_state.dart | 4 ++-- .../view/widgets/ceiling_sensor/presence_record.dart | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart index b382e16..ca1fadf 100644 --- a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart +++ b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart @@ -109,11 +109,11 @@ class CeilingSensorBloc extends Bloc { startTime: startTime.toString(), endTime: endTime.toString(), deviceUuid: deviceId, - code: 'switch_1', + code: 'presence_state', ); recordGroups = response; - - emit(UpdateState(ceilingSensorModel: deviceStatus)); + // print('---${recordGroups.data!.first.eventTime}'); + emit(FitchData()); } on DioException catch (e) { final errorData = e.response!.data; String errorMessage = errorData['message']; diff --git a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart index 8d60a5c..30725cf 100644 --- a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart +++ b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart @@ -10,6 +10,8 @@ class CeilingSensorState extends Equatable { class InitialState extends CeilingSensorState {} +class FitchData extends CeilingSensorState {} + class LoadingInitialState extends CeilingSensorState {} class UpdateState extends CeilingSensorState { @@ -20,8 +22,6 @@ class UpdateState extends CeilingSensorState { List get props => [ceilingSensorModel]; } - - class LoadingNewSate extends CeilingSensorState { final CeilingSensorModel ceilingSensorModel; const LoadingNewSate({required this.ceilingSensorModel}); diff --git a/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart b/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart index 2ef158d..9599676 100644 --- a/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart +++ b/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart @@ -30,12 +30,14 @@ class PresenceRecord extends StatelessWidget { child: DefaultContainer( width: 50, height: 50, child: CircularProgressIndicator()), ); - } else if (state is UpdateState) { + } else if (state is FitchData) { for (var record in garageDoorBloc.recordGroups.data!) { final DateTime eventDateTime = DateTime.fromMillisecondsSinceEpoch(record.eventTime!); final String formattedDate = DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime); + + // Group by formatted date if (groupedRecords.containsKey(formattedDate)) { groupedRecords[formattedDate]!.add(record); } else {