Bug fixes

2025-11-27 11:14:56 +00:00 · 2024-10-08 23:14:41 +03:00
parent 79ec890244
commit 03dfeabde4
19 changed files with 254 additions and 272 deletions
--- a/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/event.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/state.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

@ -38,12 +38,10 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {

  // Fetch batch status
  FutureOr<void> _fetchWallSensorBatchControl(
-      WallSensorFetchBatchStatusEvent event,
-      Emitter<WallSensorState> emit) async {
+      WallSensorFetchBatchStatusEvent event, Emitter<WallSensorState> emit) async {
    emit(WallSensorLoadingInitialState());
    try {
-      var response =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus = WallSensorModel.fromJson(response.status);
      emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
    } catch (e) {
@ -70,8 +68,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
  //   } catch (_) {}
  // }

-  void _changeValue(
-      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
+  void _changeValue(WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
    if (event.code == 'far_detection') {
      deviceStatus.farDetection = event.value;
@ -128,8 +125,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
      try {
        late bool response;
        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
        } else {
          response = await DevicesManagementApi()
              .deviceControl(deviceId, Status(code: code, value: value));
@ -148,10 +144,13 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
  FutureOr<void> _getDeviceReports(
      GetDeviceReportsEvent event, Emitter<WallSensorState> emit) async {
    emit(DeviceReportsLoadingState());
+    // final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
+    // final to = DateTime.now().millisecondsSinceEpoch;

    try {
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
-          .then((value) {
+      // await DevicesManagementApi.getDeviceReportsByDate(
+      //         deviceId, event.code, from.toString(), to.toString())
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
        emit(DeviceReportsState(deviceReport: value, code: event.code));
      });
    } catch (e) {
@ -160,13 +159,11 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
    }
  }

-  void _showDescription(
-      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
+  void _showDescription(ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
    emit(WallSensorShowDescriptionState(description: event.description));
  }

-  void _backToGridView(
-      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
+  void _backToGridView(BackToGridViewEvent event, Emitter<WallSensorState> emit) {
    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
  }

--- a/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart
--- a/lib/pages/device_managment/wall_sensor/bloc/wall_state.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_state.dart
--- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart
+++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart
@ -4,14 +4,13 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/bloc.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/event.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/state.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

-class WallSensorBatchControlView extends StatelessWidget
-    with HelperResponsiveLayout {
+class WallSensorBatchControlView extends StatelessWidget with HelperResponsiveLayout {
  const WallSensorBatchControlView({super.key, required this.devicesIds});

  final List<String> devicesIds;
@ -26,16 +25,13 @@ class WallSensorBatchControlView extends StatelessWidget
        ..add(WallSensorFetchBatchStatusEvent(devicesIds)),
      child: BlocBuilder<WallSensorBloc, WallSensorState>(
        builder: (context, state) {
-          if (state is WallSensorLoadingInitialState ||
-              state is DeviceReportsLoadingState) {
+          if (state is WallSensorLoadingInitialState || state is DeviceReportsLoadingState) {
            return const Center(child: CircularProgressIndicator());
          } else if (state is WallSensorUpdateState) {
-            return _buildGridView(context, state.wallSensorModel, isExtraLarge,
-                isLarge, isMedium);
+            return _buildGridView(context, state.wallSensorModel, isExtraLarge, isLarge, isMedium);
          } else if (state is DeviceReportsFailedState) {
            final model = context.read<WallSensorBloc>().deviceStatus;
-            return _buildGridView(
-                context, model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, model, isExtraLarge, isLarge, isMedium);
          }
          return const Center(child: Text('Error fetching status'));
        },
@ -43,8 +39,8 @@ class WallSensorBatchControlView extends StatelessWidget
    );
  }

-  Widget _buildGridView(BuildContext context, WallSensorModel model,
-      bool isExtraLarge, bool isLarge, bool isMedium) {
+  Widget _buildGridView(
+      BuildContext context, WallSensorModel model, bool isExtraLarge, bool isLarge, bool isMedium) {
    return GridView(
      padding: const EdgeInsets.symmetric(horizontal: 50, vertical: 20),
      shrinkWrap: true,
@ -97,12 +93,11 @@ class WallSensorBatchControlView extends StatelessWidget
            maxValue: 10000,
            steps: 1,
            description: 'sec',
-            action: (int value) =>
-                context.read<WallSensorBloc>().add(WallSensorBatchControlEvent(
-                      deviceIds: devicesIds,
-                      code: 'no_one_time',
-                      value: value,
-                    ))),
+            action: (int value) => context.read<WallSensorBloc>().add(WallSensorBatchControlEvent(
+                  deviceIds: devicesIds,
+                  code: 'no_one_time',
+                  value: value,
+                ))),
        PresenceUpdateData(
          value: model.farDetection.toDouble(),
          title: 'Far Detection:',
--- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
+++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
@ -3,9 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/description_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/bloc.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/event.dart';
-import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/state.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_status.dart';
@ -14,8 +14,7 @@ import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

-class WallSensorControlsView extends StatelessWidget
-    with HelperResponsiveLayout {
+class WallSensorControlsView extends StatelessWidget with HelperResponsiveLayout {
  const WallSensorControlsView({super.key, required this.device});

  final AllDevicesModel device;
@ -26,23 +25,19 @@ class WallSensorControlsView extends StatelessWidget
    final isLarge = isLargeScreenSize(context);
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
-      create: (context) => WallSensorBloc(deviceId: device.uuid!)
-        ..add(WallSensorFetchStatusEvent()),
+      create: (context) =>
+          WallSensorBloc(deviceId: device.uuid!)..add(WallSensorFetchStatusEvent()),
      child: BlocBuilder<WallSensorBloc, WallSensorState>(
        builder: (context, state) {
-          if (state is WallSensorLoadingInitialState ||
-              state is DeviceReportsLoadingState) {
+          if (state is WallSensorLoadingInitialState || state is DeviceReportsLoadingState) {
            return const Center(child: CircularProgressIndicator());
          } else if (state is WallSensorUpdateState) {
-            return _buildGridView(context, state.wallSensorModel, isExtraLarge,
-                isLarge, isMedium);
+            return _buildGridView(context, state.wallSensorModel, isExtraLarge, isLarge, isMedium);
          } else if (state is DeviceReportsState) {
            return ReportsTable(
              report: state.deviceReport,
-              thirdColumnTitle:
-                  state.code == 'illuminance_value' ? "Value" : 'Status',
-              thirdColumnDescription:
-                  state.code == 'illuminance_value' ? "Lux" : null,
+              thirdColumnTitle: state.code == 'illuminance_value' ? "Value" : 'Status',
+              thirdColumnDescription: state.code == 'illuminance_value' ? "Lux" : null,
              onRowTap: (index) {},
              onClose: () {
                context.read<WallSensorBloc>().add(BackToGridViewEvent());
@ -57,8 +52,7 @@ class WallSensorControlsView extends StatelessWidget
            );
          } else if (state is DeviceReportsFailedState) {
            final model = context.read<WallSensorBloc>().deviceStatus;
-            return _buildGridView(
-                context, model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, model, isExtraLarge, isLarge, isMedium);
          }
          return const Center(child: Text('Error fetching status'));
        },
@ -66,8 +60,8 @@ class WallSensorControlsView extends StatelessWidget
    );
  }

-  Widget _buildGridView(BuildContext context, WallSensorModel model,
-      bool isExtraLarge, bool isLarge, bool isMedium) {
+  Widget _buildGridView(
+      BuildContext context, WallSensorModel model, bool isExtraLarge, bool isLarge, bool isMedium) {
    return GridView(
      padding: const EdgeInsets.symmetric(horizontal: 50),
      shrinkWrap: true,
@ -136,11 +130,10 @@ class WallSensorControlsView extends StatelessWidget
            maxValue: 10000,
            steps: 1,
            description: 'sec',
-            action: (int value) =>
-                context.read<WallSensorBloc>().add(WallSensorChangeValueEvent(
-                      code: 'no_one_time',
-                      value: value,
-                    ))),
+            action: (int value) => context.read<WallSensorBloc>().add(WallSensorChangeValueEvent(
+                  code: 'no_one_time',
+                  value: value,
+                ))),
        PresenceUpdateData(
          value: model.farDetection.toDouble(),
          title: 'Far Detection:',
@ -157,8 +150,9 @@ class WallSensorControlsView extends StatelessWidget
        ),
        GestureDetector(
          onTap: () {
-            context.read<WallSensorBloc>().add(GetDeviceReportsEvent(
-                code: 'illuminance_value', deviceUuid: device.uuid!));
+            context
+                .read<WallSensorBloc>()
+                .add(GetDeviceReportsEvent(code: 'illuminance_value', deviceUuid: device.uuid!));
          },
          child: const PresenceStaticWidget(
            icon: Assets.illuminanceRecordIcon,
@ -167,8 +161,9 @@ class WallSensorControlsView extends StatelessWidget
        ),
        GestureDetector(
          onTap: () {
-            context.read<WallSensorBloc>().add(GetDeviceReportsEvent(
-                code: 'presence_state', deviceUuid: device.uuid!));
+            context
+                .read<WallSensorBloc>()
+                .add(GetDeviceReportsEvent(code: 'presence_state', deviceUuid: device.uuid!));
          },
          child: const PresenceStaticWidget(
            icon: Assets.presenceRecordIcon,