removed unnecessary * 1 calculation of height.

SP-1580-FE-Watermark-Does-Not-Match-Design-Specification

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

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_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_analytics_devices_param.dart';
+
+abstract final class FetchAirQualityDataHelper {
+  const FetchAirQualityDataHelper._();
+
+  static void loadAirQualityData(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    loadAnalyticsDevices(
+      context,
+      communityUuid: communityUuid,
+      spaceUuid: spaceUuid,
+    );
+  }
+
+  static void clearAllData(BuildContext context) {
+    context.read<AnalyticsDevicesBloc>().add(
+          const ClearAnalyticsDeviceEvent(),
+        );
+    context.read<RealtimeDeviceChangesBloc>().add(
+          const RealtimeDeviceChangesClosed(),
+        );
+  }
+
+  static void loadAnalyticsDevices(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    context.read<AnalyticsDevicesBloc>().add(
+          LoadAnalyticsDevicesEvent(
+            param: GetAnalyticsDevicesParam(
+              communityUuid: communityUuid,
+              spaceUuid: spaceUuid,
+              deviceTypes: ['AQI'],
+              requestType: AnalyticsDeviceRequestType.energyManagement,
+            ),
+            onSuccess: (device) {
+              context.read<RealtimeDeviceChangesBloc>()
+                ..add(const RealtimeDeviceChangesClosed())
+                ..add(RealtimeDeviceChangesStarted(device.uuid));
+            },
+          ),
+        );
+  }
+}

lib/pages/analytics/modules/air_quality/views/air_quality_view.dart

@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
+
+class AirQualityView extends StatelessWidget {
+  const AirQualityView({super.key});
+
+  static const _padding = EdgeInsetsDirectional.all(32);
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isMediumOrLess = constraints.maxWidth <= 900;
+        final height = MediaQuery.sizeOf(context).height;
+        if (isMediumOrLess) {
+          return SingleChildScrollView(
+            padding: _padding,
+            child: Column(
+              spacing: 32,
+              children: [
+                SizedBox(
+                  height: height * 1.2,
+                  child: const AirQualityEndSideWidget(),
+                ),
+                SizedBox(height: height * 0.5, child: const Placeholder()),
+                SizedBox(height: height * 0.5, child: const Placeholder()),
+              ],
+            ),
+          );
+        }
+
+        return SingleChildScrollView(
+          child: Container(
+            padding: _padding,
+            height: height,
+            child: const Column(
+              children: [
+                Expanded(
+                  child: Row(
+                    spacing: 32,
+                    children: [
+                      Expanded(
+                        flex: 2,
+                        child: Column(
+                          spacing: 20,
+                          children: [
+                            Expanded(child: Placeholder()),
+                            Expanded(child: Placeholder()),
+                          ],
+                        ),
+                      ),
+                      Expanded(child: AirQualityEndSideWidget()),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

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

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_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/helpers/fetch_energy_management_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AirQualityEndSideWidget extends StatelessWidget {
+  const AirQualityEndSideWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration.copyWith(
+        borderRadius: BorderRadius.circular(30),
+      ),
+      padding: const EdgeInsetsDirectional.all(32),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildHeader(context),
+          Text(
+            'Device ID:',
+            style: context.textTheme.bodySmall?.copyWith(
+              color: ColorsManager.textPrimaryColor,
+              fontWeight: FontWeight.w400,
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(height: 6),
+          SelectableText(
+            context.watch<AnalyticsDevicesBloc>().state.selectedDevice?.uuid ??
+                'N/A',
+            style: context.textTheme.bodySmall?.copyWith(
+              color: ColorsManager.blackColor,
+              fontWeight: FontWeight.w400,
+              fontSize: 12,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildHeader(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Expanded(
+          flex: 3,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerStart,
+            child: SelectableText(
+              'AQI Sensor',
+              style: context.textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.w700,
+                color: ColorsManager.vividBlue.withValues(alpha: 0.6),
+                fontSize: 18,
+              ),
+            ),
+          ),
+        ),
+        const Spacer(),
+        Expanded(
+          flex: 2,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerEnd,
+            child: AnalyticsDeviceDropdown(
+              onChanged: (value) {
+                context.read<AnalyticsDevicesBloc>().add(
+                      SelectAnalyticsDeviceEvent(value),
+                    );
+                FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
+                  context,
+                  deviceUuid: value.uuid,
+                );
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/pages/analytics/modules/analytics/enums/analytics_page_tab.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/views/air_quality_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart';
 
@@ -10,6 +11,10 @@ enum AnalyticsPageTab {
   occupancy(
     title: 'Occupancy',
     child: AnalyticsOccupancyView(),
+  ),
+  airQuality(
+    title: 'Air Quality',
+    child: AirQualityView(),
   );
 
   const AnalyticsPageTab({

lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
+  @override
+  void onCommunitySelected(
+    BuildContext context,
+    CommunityModel community,
+    List<SpaceModel> spaces,
+  ) {
+    // Do nothing
+  }
+
+  @override
+  void onSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel space,
+  ) {
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
+
+    if (isSpaceSelected) {
+      clearData(context);
+      return;
+    }
+
+    spaceTreeBloc
+      ..add(const SpaceTreeClearSelectionEvent())
+      ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+
+    FetchAirQualityDataHelper.loadAirQualityData(
+      context,
+      communityUuid: community.uuid,
+      spaceUuid: space.uuid ?? '',
+    );
+  }
+
+  @override
+  void onChildSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel child,
+  ) {
+    if (child.children.isNotEmpty) return onSpaceSelected(context, community, child);
+  }
+
+  @override
+  void clearData(BuildContext context) {
+    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    FetchAirQualityDataHelper.clearAllData(context);
+  }
+}

lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart

@@ -1,4 +1,5 @@
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart';
@@ -9,6 +10,7 @@ abstract final class AnalyticsDataLoadingStrategyFactory {
     return switch (tab) {
       AnalyticsPageTab.energyManagement => EnergyManagementDataLoadingStrategy(),
       AnalyticsPageTab.occupancy => OccupancyDataLoadingStrategy(),
+      AnalyticsPageTab.airQuality => AirQualityDataLoadingStrategy(),
     };
   }
 }

lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart

@@ -14,7 +14,6 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     List<SpaceModel> spaces,
   ) {
-    // Add to space tree bloc first
     context.read<SpaceTreeBloc>().add(
           OnCommunitySelected(
             community.uuid,
@@ -69,7 +68,9 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
     CommunityModel community,
     SpaceModel child,
   ) {
-    // Do nothing else as per original implementation
+    if (child.children.isNotEmpty) {
+      return onSpaceSelected(context, community, child);
+    }
   }
 
   @override

lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart

@@ -14,23 +14,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     CommunityModel community,
     List<SpaceModel> spaces,
   ) {
-    context.read<SpaceTreeBloc>().add(
-          OnCommunitySelected(
-            community.uuid,
-            spaces.isNotEmpty ? [spaces.first] : [],
-          ),
-        );
-
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid)) {
-      clearData(context);
-      return;
-    }
-    FetchOccupancyDataHelper.loadOccupancyData(
-      context,
-      communityId: community.uuid,
-      spaceId: spaces.isNotEmpty ? spaces.first.uuid ?? '' : '',
-    );
+    // Do Nothing
   }
 
   @override
@@ -40,26 +24,17 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     SpaceModel space,
   ) {
     final spaceTreeBloc = context.read<SpaceTreeBloc>();
-    final selectedSpacesIds = spaceTreeBloc.state.selectedSpaces;
-    final isSpaceSelected = selectedSpacesIds.contains(space.uuid);
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
 
-    if (selectedSpacesIds.isEmpty) {
-      spaceTreeBloc.add(OnCommunitySelected(community.uuid, [space]));
-    } else if (isSpaceSelected) {
-      spaceTreeBloc.add(const SpaceTreeClearSelectionEvent());
-    } else {
-      spaceTreeBloc
-        ..add(const SpaceTreeClearSelectionEvent())
-        ..add(OnSpaceSelected(community, space.uuid ?? '', []));
-    }
-
-    final spaceTreeState = context.read<SpaceTreeBloc>().state;
-    if (spaceTreeState.selectedCommunities.contains(community.uuid) ||
-        spaceTreeState.selectedSpaces.contains(space.uuid)) {
+    if (isSpaceSelected) {
       clearData(context);
       return;
     }
 
+    spaceTreeBloc
+      ..add(const SpaceTreeClearSelectionEvent())
+      ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+
     FetchOccupancyDataHelper.loadOccupancyData(
       context,
       communityId: community.uuid,
@@ -73,7 +48,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
     CommunityModel community,
     SpaceModel child,
   ) {
-    // Do nothing
+    if (child.children.isNotEmpty) return onSpaceSelected(context, community, child);
   }
 
   @override

lib/pages/common/custom_table.dart

@@ -63,7 +63,8 @@ class _DynamicTableState extends State<DynamicTable> {
     }
   }
 
-  bool _compareListOfLists(List<List<dynamic>> oldList, List<List<dynamic>> newList) {
+  bool _compareListOfLists(
+      List<List<dynamic>> oldList, List<List<dynamic>> newList) {
     // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
@@ -111,8 +112,8 @@ class _DynamicTableState extends State<DynamicTable> {
         trackVisibility: true,
         child: Scrollbar(
           controller: _horizontalScrollController,
-          thumbVisibility: false,
-          trackVisibility: false,
+          thumbVisibility: true,
+          trackVisibility: true,
           notificationPredicate: (notif) => notif.depth == 1,
           child: SingleChildScrollView(
             controller: _verticalScrollController,
@@ -132,14 +133,18 @@ class _DynamicTableState extends State<DynamicTable> {
                         children: [
                           if (widget.withCheckBox) _buildSelectAllCheckbox(),
                           ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(widget.headers[index], index);
+                            return _buildTableHeaderCell(
+                                widget.headers[index], index);
                           })
                           //...widget.headers.map((header) => _buildTableHeaderCell(header)),
                         ],
                       ),
                     ),
                     widget.isEmpty
-                        ? Column(
+                        ? SizedBox(
+                            height: widget.size.height * 0.5,
+                            width: widget.size.width,
+                            child: Column(
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: [
                                 Row(
@@ -153,25 +158,35 @@ class _DynamicTableState extends State<DynamicTable> {
                                           height: 15,
                                         ),
                                         Text(
-                                        widget.tableName == 'AccessManagement' ? 'No Password ' : 'No Devices',
+                                          widget.tableName == 'AccessManagement'
+                                              ? 'No Password '
+                                              : 'No Devices',
                                           style: Theme.of(context)
                                               .textTheme
                                               .bodySmall!
-                                            .copyWith(color: ColorsManager.grayColor),
+                                              .copyWith(
+                                                  color:
+                                                      ColorsManager.grayColor),
                                         )
                                       ],
                                     ),
                                   ],
                                 ),
                               ],
+                            ),
                           )
                         : Column(
-                            children: List.generate(widget.data.length, (index) {
+                            children:
+                                List.generate(widget.data.length, (index) {
                               final row = widget.data[index];
                               return Row(
                                 children: [
-                                  if (widget.withCheckBox) _buildRowCheckbox(index, widget.size.height * 0.08),
-                                  ...row.map((cell) => _buildTableCell(cell.toString(), widget.size.height * 0.08)),
+                                  if (widget.withCheckBox)
+                                    _buildRowCheckbox(
+                                        index, widget.size.height * 0.08),
+                                  ...row.map((cell) => _buildTableCell(
+                                      cell.toString(),
+                                      widget.size.height * 0.08)),
                                 ],
                               );
                             }),
@@ -196,7 +211,9 @@ class _DynamicTableState extends State<DynamicTable> {
       ),
       child: Checkbox(
         value: _selectAll,
-        onChanged: widget.withSelectAll && widget.data.isNotEmpty ? _toggleSelectAll : null,
+        onChanged: widget.withSelectAll && widget.data.isNotEmpty
+            ? _toggleSelectAll
+            : null,
       ),
     );
   }
@@ -238,7 +255,9 @@ class _DynamicTableState extends State<DynamicTable> {
         constraints: const BoxConstraints.expand(height: 40),
         alignment: Alignment.centerLeft,
         child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: index == widget.headers.length - 1 ? 12 : 8.0, vertical: 4),
+          padding: EdgeInsets.symmetric(
+              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
+              vertical: 4),
           child: Text(
             title,
             style: context.textTheme.titleSmall!.copyWith(

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -97,7 +97,8 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
             children: [
               _buildInfoRow('Space Name:',
                   device.spaces?.firstOrNull?.spaceName ?? 'N/A'),
-              _buildInfoRow('Room:', device.subspace?.subspaceName ?? 'N/A'),
+              _buildInfoRow(
+                  'Sub space:', device.subspace?.subspaceName ?? 'N/A'),
             ],
           ),
           TableRow(

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -38,7 +38,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty)
                           Column(
                             children: [
-                              const Text('Failed Devises'),
+                              const Text('Failed Devices'),
                               SizedBox(
                                 width: 200,
                                 height: 50,
@@ -63,7 +63,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         if (visitorBloc.passwordStatus!.successOperations.isNotEmpty)
                           Column(
                             children: [
-                              const Text('Success Devises'),
+                              const Text('Success Devices'),
                               SizedBox(
                                 width: 200,
                                 height: 50,

lib/utils/constants/assets.dart

@@ -2,6 +2,7 @@ class Assets {
   Assets._();
   static const String background = "assets/images/Background.png";
   static const String webBackground = "assets/images/web_Background.svg";
+  static const String webBackgroundPng = "assets/images/web_Background.png";
   static const String blackLogo = "assets/images/black-logo.png";
   static const String logo = "assets/images/Logo.svg";
   static const String logoHorizontal = "assets/images/logo_horizontal.png";

lib/utils/user_drop_down_menu.dart

@@ -41,7 +41,16 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
               _isDropdownOpen = false;
             });
           },
-          child: Transform.rotate(
+          child: Row(
+            children: [
+              const SizedBox(width: 12),
+              if (widget.user != null)
+                Text(
+                  '${widget.user!.firstName} ${widget.user!.lastName}',
+                  style: Theme.of(context).textTheme.bodyLarge,
+                ),
+              const SizedBox(width: 12),
+              Transform.rotate(
                 angle: _isDropdownOpen ? -1.5708 : 1.5708,
                 child: const Icon(
                   Icons.arrow_forward_ios,
@@ -49,6 +58,8 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
                   size: 16,
                 ),
               ),
+            ],
+          ),
         ),
       ],
     );

lib/web_layout/web_app_bar.dart

@@ -92,13 +92,6 @@ class DesktopAppBar extends StatelessWidget {
         if (rightBody != null) rightBody!,
         const SizedBox(width: 24),
         _UserAvatar(),
-        const SizedBox(width: 12),
-        if (user != null)
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style: Theme.of(context).textTheme.bodyLarge,
-          ),
-        const SizedBox(width: 12),
         UserDropdownMenu(user: user),
       ],
     );
@@ -146,14 +139,6 @@ class TabletAppBar extends StatelessWidget {
         if (rightBody != null) rightBody!,
         const SizedBox(width: 16),
         _UserAvatar(),
-        if (user != null) ...[
-          const SizedBox(width: 8),
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style:
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
-          ),
-        ],
         UserDropdownMenu(user: user),
       ],
     );
@@ -215,14 +200,6 @@ class MobileAppBar extends StatelessWidget {
     return Row(
       children: [
         _UserAvatar(),
-        if (user != null) ...[
-          const SizedBox(width: 8),
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style:
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
-          ),
-        ],
         UserDropdownMenu(user: user),
       ],
     );

lib/web_layout/web_scaffold.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/web_layout/web_app_bar.dart';
+
 import 'menu_sidebar.dart';
 
 class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
@@ -28,14 +28,11 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout {
         SizedBox(
           width: MediaQuery.sizeOf(context).width,
           height: MediaQuery.sizeOf(context).height,
-          child: SvgPicture.asset(
-            Assets.webBackground,
+          child: Image.asset(
+            Assets.webBackgroundPng,
             fit: BoxFit.cover,
           ),
         ),
-        Container(
-          color: Colors.white.withOpacity(0.7),
-        ),
         Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [