Reads the correct date to load aqi data.

lib/pages/analytics/models/analytics_device.dart

@@ -25,8 +25,8 @@ class AnalyticsDevice {
 
   factory AnalyticsDevice.fromJson(Map<String, dynamic> json) {
     return AnalyticsDevice(
-      uuid: json['uuid'] as String,
-      name: json['name'] as String,
+      uuid: json['uuid'] as String? ?? '',
+      name: json['name'] as String? ?? '',
       createdAt: json['createdAt'] != null
           ? DateTime.parse(json['createdAt'] as String)
           : null,
@@ -39,8 +39,8 @@ class AnalyticsDevice {
           ? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
           : null,
       spaceUuid: json['spaceUuid'] as String?,
-      latitude: json['lat'] != null ? double.parse(json['lat'] as String) : null,
-      longitude: json['lon'] != null ? double.parse(json['lon'] as String) : null,
+      latitude: json['lat'] != null ? double.parse(json['lat'] as String? ?? '0.0') : null,
+      longitude: json['lon'] != null ? double.parse(json['lon'] as String? ?? '0.0') : null,
     );
   }
 }

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

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_qualit
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
 import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
@@ -22,13 +21,14 @@ abstract final class FetchAirQualityDataHelper {
     required String spaceUuid,
     bool shouldFetchAnalyticsDevices = true,
   }) {
-    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
     final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
-    loadAnalyticsDevices(
-      context,
-      communityUuid: communityUuid,
-      spaceUuid: spaceUuid,
-    );
+    if (shouldFetchAnalyticsDevices) {
+      loadAnalyticsDevices(
+        context,
+        communityUuid: communityUuid,
+        spaceUuid: spaceUuid,
+      );
+    }
     loadRangeOfAqi(
       context,
       spaceUuid: spaceUuid,

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

@@ -65,7 +65,7 @@ class AqiDeviceInfo extends StatelessWidget {
         );
         final tvocValue = _getValueForStatus(
           status,
-          'tvoc_value',
+          'voc_value',
           formatter: (value) => (value / 100).toStringAsFixed(2),
         );
 

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

@@ -7,7 +7,7 @@ enum AqiType {
   pm25('PM2.5', 'µg/m³', 'pm25'),
   pm10('PM10', 'µg/m³', 'pm10'),
   hcho('HCHO', 'mg/m³', 'cho2'),
-  tvoc('TVOC', 'µg/m³', 'voc'),
+  tvoc('TVOC', 'mg/m³', 'voc'),
   co2('CO2', 'ppm', 'co2');
 
   const AqiType(this.value, this.unit, this.code);

lib/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart

@@ -81,7 +81,7 @@ abstract final class FetchOccupancyDataHelper {
             param: GetAnalyticsDevicesParam(
               communityUuid: communityUuid,
               spaceUuid: spaceUuid,
-              deviceTypes: ['WPS', 'CPS'],
+              deviceTypes: ['WPS', 'CPS', 'NCPS'],
               requestType: AnalyticsDeviceRequestType.occupancy,
             ),
             onSuccess: (device) {

lib/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart

@@ -20,7 +20,7 @@ class AnalyticsOccupancyView extends StatelessWidget {
             child: Column(
               spacing: 32,
               children: [
-                SizedBox(height: height * 0.46, child: const OccupancyEndSideBar()),
+                SizedBox(height: height * 0.8, child: const OccupancyEndSideBar()),
                 SizedBox(height: height * 0.5, child: const OccupancyChartBox()),
                 SizedBox(height: height * 0.5, child: const OccupancyHeatMapBox()),
               ],

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

@@ -26,7 +26,6 @@ class OccupancyEndSideBar extends StatelessWidget {
               const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
               Expanded(
                 child: SizedBox(
-                  // height: MediaQuery.sizeOf(context).height * 0.2,
                   child: PowerClampEnergyStatusWidget(
                     status: [
                       PowerClampEnergyStatus(

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -21,6 +21,7 @@ import 'package:syncrow_web/utils/snack_bar.dart';
 
 class VisitorPasswordBloc
     extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
+
   VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
     on<SelectUsageFrequency>(selectUsageFrequency);
     on<FetchDevice>(_onFetchDevice);
@@ -67,7 +68,7 @@ class VisitorPasswordBloc
   DateTime? startTime = DateTime.now();
   DateTime? endTime;
 
-  String startTimeAccess = DateTime.now().toString().split('.').first;
+  String startTimeAccess = 'Start Time';
   String endTimeAccess = 'End Time';
   PasswordStatus? passwordStatus;
   selectAccessType(
@@ -86,9 +87,6 @@ class VisitorPasswordBloc
     SelectTimeVisitorPassword event,
     Emitter<VisitorPasswordState> emit,
   ) async {
-    // Ensure expirationTimeTimeStamp has a value
-    effectiveTimeTimeStamp ??= DateTime.now().millisecondsSinceEpoch ~/ 1000;
-
     final DateTime? picked = await showDatePicker(
       context: event.context,
       initialDate: DateTime.now(),
@@ -96,124 +94,65 @@ class VisitorPasswordBloc
       lastDate: DateTime.now().add(const Duration(days: 5095)),
     );
 
-    if (picked == null) return;
-
-    final TimeOfDay? timePicked = await showTimePicker(
-      context: event.context,
-      initialTime: TimeOfDay.now(),
-      builder: (context, child) {
-        return Theme(
-          data: ThemeData.light().copyWith(
-            colorScheme: const ColorScheme.light(
-              primary: ColorsManager.primaryColor,
-              onSurface: Colors.black,
+    if (picked != null) {
+      final TimeOfDay? timePicked = await showTimePicker(
+        context: event.context,
+        initialTime: TimeOfDay.now(),
+        builder: (context, child) {
+          return Theme(
+            data: ThemeData.light().copyWith(
+              colorScheme: const ColorScheme.light(
+                primary: ColorsManager.primaryColor,
+                onSurface: Colors.black,
+              ),
+              buttonTheme: const ButtonThemeData(
+                colorScheme: ColorScheme.light(
+                  primary: Colors.green,
+                ),
+              ),
             ),
-          ),
-          child: child!,
+            child: child!,
+          );
+        },
+      );
+
+      if (timePicked != null) {
+        final selectedDateTime = DateTime(
+          picked.year,
+          picked.month,
+          picked.day,
+          timePicked.hour,
+          timePicked.minute,
         );
-      },
-    );
 
-    if (timePicked == null) return;
+        final selectedTimestamp =
+            selectedDateTime.millisecondsSinceEpoch ~/ 1000;
 
-    final selectedDateTime = DateTime(
-      picked.year,
-      picked.month,
-      picked.day,
-      timePicked.hour,
-      timePicked.minute,
-    );
-    final selectedTimestamp = selectedDateTime.millisecondsSinceEpoch ~/ 1000;
-    final currentTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-
-    if (event.isStart) {
-      // START TIME VALIDATION
-      if (expirationTimeTimeStamp != null &&
-          selectedTimestamp > expirationTimeTimeStamp!) {
-        await showDialog<void>(
-          context: event.context,
-          builder: (context) => AlertDialog(
-            title: const Text(
+        if (event.isStart) {
+          if (expirationTimeTimeStamp != null &&
+              selectedTimestamp > expirationTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar(
               'Effective Time cannot be later than Expiration Time.',
-            ),
-            actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
-              onPressed: () {
-                Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: true,
-                  isRepeat: false,
-                ));
-              },
-              child: const Text('OK'),
-            ),
-          ),
-        );
-        return;
-      }
-
-      if (selectedTimestamp < currentTimestamp) {
-        await showDialog<void>(
-          context: event.context,
-          builder: (context) => AlertDialog(
-            title: const Text(
-              'Effective Time cannot be earlier than current time.',
-            ),
-            actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
-              onPressed: () {
-                Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: true,
-                  isRepeat: false,
-                ));
-              },
-              child: const Text('OK'),
-            ),
-          ),
-        );
-        return;
-      }
-
-      // Save effective time
-      effectiveTimeTimeStamp = selectedTimestamp;
-      startTimeAccess = selectedDateTime.toString().split('.').first;
-    } else {
-      // END TIME VALIDATION
-      if (effectiveTimeTimeStamp != null &&
-          selectedTimestamp < effectiveTimeTimeStamp!) {
-        await showDialog<void>(
-          context: event.context,
-          builder: (context) => AlertDialog(
-            title: const Text(
+            );
+            return;
+          }
+          effectiveTimeTimeStamp = selectedTimestamp;
+          startTimeAccess = selectedDateTime.toString().split('.').first;
+        } else {
+          if (effectiveTimeTimeStamp != null &&
+              selectedTimestamp < effectiveTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar(
               'Expiration Time cannot be earlier than Effective Time.',
-            ),
-            actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
-              onPressed: () {
-                Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: false,
-                  isRepeat: false,
-                ));
-              },
-              child: const Text('OK'),
-            ),
-          ),
-        );
-        return;
+            );
+            return;
+          }
+          expirationTimeTimeStamp = selectedTimestamp;
+          endTimeAccess = selectedDateTime.toString().split('.').first;
+        }
+        emit(ChangeTimeState());
+        emit(VisitorPasswordInitial());
       }
-
-      // Save expiration time
-      expirationTimeTimeStamp = selectedTimestamp;
-      endTimeAccess = selectedDateTime.toString().split('.').first;
     }
-
-    emit(ChangeTimeState());
-    emit(VisitorPasswordInitial());
   }
 
   bool toggleRepeat(
@@ -253,7 +192,7 @@ class VisitorPasswordBloc
       FetchDevice event, Emitter<VisitorPasswordState> emit) async {
     try {
       emit(DeviceLoaded());
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+         final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       data = await AccessMangApi().fetchDoorLockDeviceList(projectUuid);
       emit(TableLoaded(data));