Apply correct business logic in OccupancyDataLoadingStrategy.

Sp 1475 fe only the arrow button is clickable make the whole name clickable with the arrow

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
+    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;
 
@@ -132,46 +133,60 @@ 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(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Row(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  Column(
-                                    children: [
-                                      SvgPicture.asset(Assets.emptyTable),
-                                      const SizedBox(
-                                        height: 15,
-                                      ),
-                                      Text(
-                                        widget.tableName == 'AccessManagement' ? 'No Password ' : 'No Devices',
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall!
-                                            .copyWith(color: ColorsManager.grayColor),
-                                      )
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ],
+                        ? SizedBox(
+                            height: widget.size.height * 0.5,
+                            width: widget.size.width,
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Row(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    Column(
+                                      children: [
+                                        SvgPicture.asset(Assets.emptyTable),
+                                        const SizedBox(
+                                          height: 15,
+                                        ),
+                                        Text(
+                                          widget.tableName == 'AccessManagement'
+                                              ? 'No Password '
+                                              : 'No Devices',
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .bodySmall!
+                                              .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/utils/user_drop_down_menu.dart

@@ -41,13 +41,24 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
               _isDropdownOpen = false;
             });
           },
-          child: Transform.rotate(
-            angle: _isDropdownOpen ? -1.5708 : 1.5708,
-            child: const Icon(
-              Icons.arrow_forward_ios,
-              color: Colors.white,
-              size: 16,
-            ),
+          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,
+                  color: Colors.white,
+                  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),
       ],
     );