Added: Manager View functionality for viewing subordinates' assets

app/Http/Controllers/SettingsController.php

@@ -336,6 +336,7 @@ public function postSettings(Request $request) : RedirectResponse
         $setting->dash_chart_type = $request->input('dash_chart_type');
         $setting->profile_edit = $request->input('profile_edit', 0);
         $setting->require_checkinout_notes = $request->input('require_checkinout_notes', 0);
+        $setting->manager_view_enabled = $request->input('manager_view_enabled', '0');
 
 
         if ($request->input('per_page') != '') {

app/Http/Controllers/ViewAssetsController.php

@@ -27,47 +27,66 @@ class ViewAssetsController extends Controller
      * Redirect to the profile page.
      *
      */
-    public function getIndex() : View | RedirectResponse
+    public function getIndex(Request $request) : View | RedirectResponse
     {
-        $user = User::with(
-            'assets',
-            'assets.model',
-            'assets.model.fieldset.fields',
-            'consumables',
-            'accessories',
-            'licenses',
-        )->find(auth()->id());
+        $authUser = auth()->user();
+        $settings = Setting::getSettings();
+        $subordinates = collect();
+        $selectedUserId = $authUser->id;
 
-        $field_array = array();
+        // Check if manager view is enabled and get subordinates if applicable
+        if ($settings->manager_view_enabled) {
+            // Get all subordinates including self, sorted for the dropdown
+            $subordinates = $authUser->getAllSubordinates(true)->sortBy('last_name')->sortBy('first_name');
 
-        // Loop through all the custom fields that are applied to any model the user has assigned
-        foreach ($user->assets as $asset) {
+            // If the user has subordinates and a user_id is provided in the request
+            if ($subordinates->count() > 1 && $request->filled('user_id')) {
+                $requestedUserId = (int) $request->input('user_id');
 
-            // Make sure the model has a custom fieldset before trying to loop through the associated fields
-            if ($asset->model->fieldset) {
+                // Validate if the requested user is allowed (self or subordinate)
+                if ($subordinates->contains('id', $requestedUserId)) {
+                    $selectedUserId = $requestedUserId;
+                }
+                // If invalid ID or not authorized, $selectedUserId remains $authUser->id (default)
+            }
+        }
 
+        // Load the data for the user to be viewed (either auth user or selected subordinate)
+        $userToView = User::with([
+            'assets',
+            'assets.model',
+             'assets.model.fieldset.fields',
+             'consumables',
+             'accessories',
+             'licenses'
+         ])->find($selectedUserId);
+
+        // If the user to view couldn't be found (shouldn't happen with proper logic), redirect with error
+        if (!$userToView) {
+             return redirect()->route('home')->with('error', trans('admin/users/message.user_not_found'));
+        }
+
+        // Process custom fields for the user being viewed
+        $field_array = [];
+        foreach ($userToView->assets as $asset) {
+            if ($asset->model && $asset->model->fieldset) {
                 foreach ($asset->model->fieldset->fields as $field) {
-                    // check and make sure they're allowed to see the value of the custom field
                     if ($field->display_in_user_view == '1') {
                         $field_array[$field->db_column] = $field->name;
                     }
-
                 }
             }
-
         }
-
-        // Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns
-        array_unique($field_array);
-
-        if (isset($user->id)) {
-            return view('account/view-assets', compact('user', 'field_array' ))
-                ->with('settings', Setting::getSettings());
-        }
-
-        // Redirect to the user management page
-        return redirect()->route('users.index')
-            ->with('error', trans('admin/users/message.user_not_found', $user->id));
+        array_unique($field_array); // Remove duplicate field names
+
+        // Pass the necessary data to the view
+        return view('account/view-assets', [
+            'user' => $userToView, // Use 'user' for compatibility with the existing view
+            'field_array' => $field_array,
+            'settings' => $settings,
+            'subordinates' => $subordinates,
+            'selectedUserId' => $selectedUserId
+        ]);
     }
 
     /**

app/Models/Setting.php

@@ -67,6 +67,7 @@ class Setting extends Model
         'google_login',
         'google_client_id',
         'google_client_secret',
+        'manager_view_enabled',
     ];
 
     protected $casts = [

app/Models/User.php

@@ -868,6 +868,73 @@ public function getUserTotalCost(){
 
         return $this;
     }
+
+    /**
+     * Get all direct and indirect subordinates for this user.
+     *
+     * @param bool $includeSelf Include the current user in the results
+     * @return \Illuminate\Support\Collection
+     */
+    public function getAllSubordinates($includeSelf = false)
+    {
+        $subordinates = collect();
+        if ($includeSelf) {
+            $subordinates->push($this);
+        }
+
+        // Use a recursive helper function to avoid scope issues
+        $this->fetchSubordinatesRecursive($this, $subordinates);
+
+        return $subordinates->unique('id'); // Ensure uniqueness
+    }
+
+    /**
+     * Recursive helper function to fetch subordinates.
+     *
+     * @param User $manager
+     * @param \Illuminate\Support\Collection $subordinatesCollection
+     */
+    protected function fetchSubordinatesRecursive(User $manager, \Illuminate\Support\Collection &$subordinatesCollection)
+    {
+        // Eager load 'managesUsers' to prevent N+1 queries in recursion
+        $directSubordinates = $manager->managesUsers()->with('managesUsers')->get();
+
+        foreach ($directSubordinates as $directSubordinate) {
+            // Add subordinate if not already in the collection
+            if (!$subordinatesCollection->contains('id', $directSubordinate->id)) {
+                 $subordinatesCollection->push($directSubordinate);
+                 // Recursive call for this subordinate's subordinates
+                 $this->fetchSubordinatesRecursive($directSubordinate, $subordinatesCollection);
+            }
+        }
+    }
+
+    /**
+     * Check if the current user is a direct or indirect manager of the given user.
+     *
+     * @param User $userToCheck
+     * @return bool
+     */
+    public function isManagerOf(User $userToCheck): bool
+    {
+        // Optimization: If it's the same user, they are not their own manager
+        if ($this->id === $userToCheck->id) {
+            return false;
+        }
+
+        // Eager load manager relationship to potentially reduce queries in the loop
+        $manager = $userToCheck->load('manager')->manager;
+        while ($manager) {
+            if ($manager->id === $this->id) {
+                return true;
+            }
+            // Move up the hierarchy (load relationship if not already loaded)
+            $manager = $manager->load('manager')->manager;
+        }
+        return false;
+    }
+
+
     public function scopeUserLocation($query, $location, $search){
 
 

app/Providers/AppServiceProvider.php

@@ -18,10 +18,12 @@
 use App\Observers\LicenseObserver;
 use App\Observers\SettingObserver;
 use Illuminate\Routing\UrlGenerator;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\View; 
 
 /**
  * This service provider handles setting the observers on models
@@ -73,6 +75,69 @@ public function boot(UrlGenerator $url)
         Consumable::observe(ConsumableObserver::class);
         License::observe(LicenseObserver::class);
         Setting::observe(SettingObserver::class);
+
+        // Share manager view data with the default layout if enabled and user is logged in
+        View::composer('layouts.default', function ($view) {
+            if (Auth::check()) {
+                $settings = Setting::getSettings();
+                $user = Auth::user();
+                $subordinates = collect(); // Initialize as empty collection
+                $selectedUserId = $user->id; // Default to current user
+
+                // Use getAllSubordinates(true) which includes the manager themselves
+                if ($settings->manager_view_enabled) {
+                     if ($user->isSuperUser()) {
+                         // SuperAdmin sees all users
+                         $subordinates = User::select('id', 'first_name', 'last_name', 'username')->get();
+                     } else {
+                         // Regular manager sees their subordinates + self
+                         $subordinates = $user->getAllSubordinates(true); // Use the correct method, includes self
+                     }
+
+                     // Check if a specific user ID is requested via query parameter
+                     if (request()->filled('user_id') && $subordinates->contains('id', request('user_id'))) {
+                         $selectedUserId = (int) request('user_id');
+                     } elseif (session()->has('manager_view_user_id') && $subordinates->contains('id', session('manager_view_user_id'))) {
+                         // Optionally check session if you store the selection there
+                         $selectedUserId = (int) session('manager_view_user_id');
+                     }
+
+                     // Store the selected ID in session if needed for persistence across requests
+                     // session(['manager_view_user_id' => $selectedUserId]);
+
+                }
+
+
+                // Only pass subordinates if the count is greater than 1
+                if ($subordinates->count() > 1) {
+                    $view->with('subordinates', $subordinates->sortBy('username')); // Sort for better display
+                    $view->with('selectedUserId', $selectedUserId);
+                } else {
+                    // Pass empty collection if not applicable
+                     $view->with('subordinates', collect());
+                     $view->with('selectedUserId', $user->id); // Default to self if no subordinates applicable
+                }
+
+                // Always pass settings
+                $view->with('settings', $settings);
+
+                // RE-ADD TEMPORARY DEBUG LOGGING
+                Log::debug('View Composer for layouts.default (After Fixes):');
+                Log::debug(' - User ID: ' . ($user->id ?? 'null'));
+                Log::debug(' - Is SuperUser: ' . ($user->isSuperUser() ? 'true' : 'false'));
+                Log::debug(' - manager_view_enabled: ' . (isset($settings->manager_view_enabled) ? $settings->manager_view_enabled : 'not set'));
+                Log::debug(' - subordinates count: ' . ($subordinates->count() ?? 'null'));
+                Log::debug(' - selectedUserId: ' . ($selectedUserId ?? 'null'));
+                // END TEMPORARY DEBUG LOGGING
+
+
+            } else {
+                 // Pass default/empty values if user is not logged in
+                 $view->with('settings', Setting::getSettings()); // Still might need settings for guests
+                 $view->with('subordinates', collect());
+                 $view->with('selectedUserId', null);
+            }
+        });
     }
 
     /**

config/version.php

@@ -6,5 +6,5 @@
   'prerelease_version' => '',
   'hash_version' => 'gc29bdbdac',
   'full_hash' => 'v8.0.4-29-gc29bdbdac',
-  'branch' => 'develop',
+  'branch' => 'master',
 );

database/migrations/2025_03_27_220955_add_manager_view_option_to_settings_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Check if the column already exists before trying to add it
+        if (!Schema::hasColumn('settings', 'manager_view_enabled')) {
+            Schema::table('settings', function (Blueprint $table) {
+                // Add the new column, defaulting to false (0)
+                // Place it after 'show_images_in_email' for organization if that column exists
+                if (Schema::hasColumn('settings', 'show_images_in_email')) {
+                    $table->boolean('manager_view_enabled')->default(false)->after('show_images_in_email');
+                } else {
+                    $table->boolean('manager_view_enabled')->default(false);
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Check if the column exists before trying to drop it
+        if (Schema::hasColumn('settings', 'manager_view_enabled')) {
+            Schema::table('settings', function (Blueprint $table) {
+                $table->dropColumn('manager_view_enabled');
+            });
+        }
+    }
+};