NottingHack · AaronJackson · Mar 22, 2025 · Mar 22, 2025 · Mar 22, 2025 · Mar 22, 2025
diff --git a/app/Http/Controllers/Tools/ToolController.php b/app/Http/Controllers/Tools/ToolController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Tools;
 
 use App\Http\Controllers\Controller;
+use Carbon\Carbon;
 use HMS\Entities\Tools\Tool;
 use HMS\Entities\User;
 use HMS\Factories\Tools\UsageFactory;
@@ -174,6 +175,48 @@ public function show(Tool $tool)
         return view('tools.tool.show')->with('tool', $tool);
     }
 
+    /**
+     * Show usage for a specific tool.
+     * Visible to those who can edit all tools, and the specific tool maintainer.
+     *
+     * @param Request $request
+     * @param Tool $tool
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showUsage(Request $request, Tool $tool)
+    {
+        if (Gate::none([
+            'tools.edit',
+            'tools.' . $tool->getPermissionName() . '.maintain',
+        ])) {
+            throw new AuthorizationException('This action is unauthorized.');
+        }
+
+        $validatedData = $request->validate([
+            'startDate' => 'required_with:endDate|date_format:Y-m-d',
+            'endDate' => 'required_with:startDate|date_format:Y-m-d',
+        ]);
+
+        if (array_key_exists('startDate', $validatedData)) {
+            $startDate = new Carbon($validatedData['startDate']);
+            $startDate->startOfDay();
+            $endDate = new Carbon($validatedData['endDate']);
+            $endDate->endOfDay();
+        } else {
+            $startDate = Carbon::now()->subDays(7);
+            $endDate = Carbon::now()->endOfDay();
+        }
+
+        $usage = $this->usageRepository->findByToolBetween($tool, $startDate, $endDate);
+
+        return view('tools.tool.usage')
+            ->with('tool', $tool)
+            ->with('usage', $usage)
+            ->with('startDate', $startDate)
+            ->with('endDate', $endDate);
+    }
+
     /**
      * Display the specified resource.
      *

diff --git a/resources/views/snackspace/purchasePayment/payment_report.blade.php b/resources/views/snackspace/purchasePayment/payment_report.blade.php
@@ -50,7 +50,7 @@
   </table>
   <hr>
   <h3>Change report period</h3>
-  <form role="form" method="GET" actin="{{ route('snackspace.payment-report') }}">
+  <form role="form" method="GET" action="{{ route('snackspace.payment-report') }}">
     <div class="form-group">
       <label for="startDate" class="form-label">Date</label>
       <input class="form-control @error('startDate') is-invalid @enderror" id="startDate" type="date" name="startDate" value="{{ old('startDate', $startDate->toDateString()) }}" required>

diff --git a/resources/views/tools/tool/show.blade.php b/resources/views/tools/tool/show.blade.php
@@ -47,7 +47,7 @@
         <tr>
           <th>Hidden</th>
           <td>{{ $tool->isHidden() ? "Yes" : "No" }}</td>
-        </td>
+        </tr>
       </tbody>
     </table>
   </div>
@@ -68,15 +68,18 @@
   <br>
   @endcan
 
-  @canany(['tools.' . $tool->getPermissionName() . '.maintain', 'tools.maintainer.grant'])
   <p>
-  <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::MAINTAINER]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Maintainers</a>
+  @canany(['tools.' . $tool->getPermissionName() . '.maintain', 'tools.maintainer.grant'])
+    <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::MAINTAINER]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Maintainers</a>
+  @endcan
+  @canany(['tools.' . $tool->getPermissionName() . '.maintain', 'tools.edit'])
+    <a href="{{ route('tools.usage', ['tool' => $tool->getId()]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> Show Recent Usage</a>
   @endcan
   @canany(['tools.' . $tool->getPermissionName() . '.maintain', 'tools.inductor.grant' , 'tools.' . $tool->getPermissionName() . '.induct'])
-  <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::INDUCTOR]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Inductors</a>
+    <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::INDUCTOR]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Inductors</a>
   @endcan
   @can('tools.user.grant')
-  <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::USER]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Users</a>
+    <a href="{{ route('tools.users-for-grant', ['tool' => $tool->getId(), 'grantType' => HMS\Tools\ToolManager::USER]) }}" class="btn btn-primary btn-block"><i class="far fa-eye"></i> View Users</a>
   @endcan
   </p>
 </div>

diff --git a/resources/views/tools/tool/usage.blade.php b/resources/views/tools/tool/usage.blade.php
@@ -0,0 +1,61 @@
+@extends('layouts.app')
+
+@section('pageTitle', $tool->getDisplayName().' Settings')
+
+@section('content')
+<div class="container">
+  <h1>Usage: {{ $tool->getName() }}</h1>
+  @forelse ($usage as $use)
+  @if ($loop->first)
+  <div class="table-responsive no-more-tables">
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Member</th>
+          <th>Start Time</th>
+          <th>End Time</th>
+        </tr>
+      </thead>
+      <tbody>
+  @endif
+        <tr>
+          <td>{{ $use->getUser()->getFullname() }}</td>
+          <td>{{ $use->getStart() }} </td>
+          <td>{{ $use->getStart()->addSeconds($use->getDuration()) }}</td>
+        </tr>
+  @if( $loop->last)
+      </tbody>
+    </table>
+  </div>
+  @endif
+  @empty
+  <p>
+    No usage for this period.
+  </p>
+  @endforelse
+
+  <h3>Change usage period</h3>
+  <form role="form" method="GET" action="{{ route('tools.usage', $tool->getId()) }}">
+    <div class="form-group">
+      <label for="startDate" class="form-label">Date</label>
+      <input class="form-control @error('startDate') is-invalid @enderror" id="startDate" type="date" name="startDate" value="{{ old('startDate', $startDate->toDateString()) }}" required>
+      @error('startDate')
+      <p class="invalid-feedback">
+        <strong>{{ $errors->first('startDate') }}</strong>
+      </p>
+      @enderror
+    </div>
+    <div class="form-group">
+      <label for="endDate" class="form-label">Date</label>
+      <input class="form-control @error('endDate') is-invalid @enderror" id="endDate" type="date" name="endDate" value="{{ old('endDate', $endDate->toDateString()) }}" required>
+      @error('endDate')
+      <p class="invalid-feedback">
+        <strong>{{ $errors->first('endDate') }}</strong>
+      </p>
+      @enderror
+    </div>
+
+    <button type="submit" class="btn btn-primary btn-block"><i class="fa fa-redo"></i> Update period</button>
+  </form>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -320,6 +320,8 @@
     // Tools
     Route::get('tools/{tool}/users/{grantType}', [ToolController::class, 'showUsersForGrant'])
         ->name('tools.users-for-grant');
+    Route::get('tools/{tool}/usage', [ToolController::class, 'showUsage'])
+        ->name('tools.usage');
     Route::patch('tools/{tool}/grant', [ToolController::class, 'grant'])->name('tools.grant');
     Route::delete('tools/{tool}/revoke/{grantType}/users/{user}', [ToolController::class, 'revoke'])
         ->name('tools.revoke.users');