Merge branch 'staging' into deployment

EotvosCollegium · Oct 1, 2024 · 242b631 · 242b631
2 parents a6e1754 + 650b910
commit 242b631
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 16 deletions.
diff --git a/app/Http/Controllers/Dormitory/Reservations/ReservableItemController.php b/app/Http/Controllers/Dormitory/Reservations/ReservableItemController.php
@@ -114,12 +114,17 @@ public function delete(ReservableItem $item)
 
     /**
      * Sends admins and staff an email notification
-     * about an allegedly faulty item.
+     * about an allegedly faulty item,
+     * with a message provided in a modal dialog.
      */
-    public function reportFault(ReservableItem $item)
+    public function reportFault(ReservableItem $item, Request $request)
     {
         $this->authorize('view', $item);
 
+        $validatedData = $request->validate([
+            'message' => 'nullable|max:2047'
+        ]);
+
         $thoseToNotify = User::whereHas('roles', function ($query) {
             $query->whereIn('name', [Role::SYS_ADMIN, Role::STAFF]);
         })->get();
@@ -128,7 +133,8 @@ public function reportFault(ReservableItem $item)
                 new ReportReservableItemFault(
                     $item,
                     $toNotify->name,
-                    user()->name
+                    user()->name,
+                    $validatedData['message']
                 )
             );
         }
@@ -147,7 +153,7 @@ public function toggleOutOfOrder(ReservableItem $item)
 
         $item->update(['out_of_order' => !$item->out_of_order]);
 
-        foreach ($item->usersWithActiveReservation as $toNotify) {
+        foreach ($item->usersWithActiveReservation()->get() as $toNotify) {
             Mail::to($toNotify)->queue(new ReservationAffected(
                 $item,
                 $toNotify->name

diff --git a/app/Mail/Reservations/ReportReservableItemFault.php b/app/Mail/Reservations/ReportReservableItemFault.php
@@ -20,15 +20,17 @@ class ReportReservableItemFault extends Mailable
     public ReservableItem $item;
     public string $recipient;
     public string $reporter;
+    public ?string $message; // this is an explanation of the problem provided via a modal dialog
 
     /**
      * Create a new message instance.
      */
-    public function __construct(ReservableItem $item, string $recipient, string $reporter)
+    public function __construct(ReservableItem $item, string $recipient, string $reporter, ?string $message)
     {
         $this->item = $item;
         $this->recipient = $recipient;
         $this->reporter = $reporter;
+        $this->message = $message;
     }
 
     /**

diff --git a/app/Models/Reservations/ReservableItem.php b/app/Models/Reservations/ReservableItem.php
@@ -47,10 +47,12 @@ public function users(): BelongsToMany
     /**
      * The users who currently have a reservation for this item.
      */
-    public function usersWithActiveReservation(): BelongsToMany
+    public function usersWithActiveReservation()
     {
-        return $this->belongsToMany(User::class, Reservation::class, 'reservable_item_id', 'user_id')
-            ->wherePivot('reserved_until', '>', Carbon::now());
+        return User::whereHas('reservations', function ($query) {
+            $query->where('reservable_item_id', $this->id)
+                ->where('reserved_until', '>', Carbon::now());
+        });
     }
 
     /**

diff --git a/config/app.php b/config/app.php
@@ -15,7 +15,7 @@
 
     'name' => env('APP_NAME', 'Urán'),
 
-    'version' => '3.26.1', // update on release
+    'version' => '3.26.2', // update on release
 
     'logo_blue_path' => env('APP_ENV', "local") != "production" ? '/img/mars.png' : '/img/uran_blue.png',
 

diff --git a/resources/lang/en/reservations.php b/resources/lang/en/reservations.php
@@ -7,6 +7,7 @@
     'bad_for_non-recurring' => 'Bad request for non-recurring reservation.',
     'check_reservations' => 'Please organize your reservations accordingly.',
     'create' => 'New reservation', // page title in breadcrumb
+    'describe_what_happened' => 'Describe what happened in a few sentences.',   // when reporting a fault
     'edit' => 'Edit reservation', // a page title
     'edit_all' => 'For all reservations',
     'edit_all_after' => 'For this reservation and all after this one',

diff --git a/resources/lang/hu/reservations.php b/resources/lang/hu/reservations.php
@@ -7,6 +7,7 @@
     'bad_for_non-recurring' => 'Nem ismétlődő foglaláshoz ez érvénytelen kérés.',
     'check_reservations' => 'Kérjük, ennek megfelelően tervezze újra foglalásait.',
     'create' => 'Új foglalás', // page title in breadcrumb
+    'describe_what_happened' => 'Pár mondatban írja le, mi történt.',   // when reporting a fault
     'edit' => 'Foglalás szerkesztése', // a page title
     'edit_all' => 'Minden foglalásra',
     'edit_all_after' => 'Erre és minden későbbi foglalásra',

diff --git a/resources/sass/materialize.scss b/resources/sass/materialize.scss
@@ -39,6 +39,10 @@ i.material-icons {
 .card a {
     text-decoration: underline;
 }
+/* but not a-based buttons */
+.card a.btn {
+    text-decoration: none;
+}
 
 blockquote {
     margin: 20px 0;
@@ -301,6 +305,11 @@ body.dark a.btn {
     box-sizing: border-box;
 }
 
+// for footers of modal dialogs
+.modal .modal-footer {
+    height: auto;
+}
+
 @mixin column-count($ct) {
     -webkit-column-count: $ct;
     -moz-column-count: $ct;

diff --git a/resources/views/dormitory/reservations/item_table.blade.php b/resources/views/dormitory/reservations/item_table.blade.php
@@ -7,7 +7,7 @@
             <th style="max-width: 30%;">@lang('reservations.item_status')</th>
             <th style="text-align: right;">@lang('reservations.item_name')</th>
             {{-- for fault report buttons --}}
-            <th style="max-width: 10%;"></th>
+            <th style="width: 250px;"></th>
         </tr>
     </thead>
     <tbody>
@@ -28,18 +28,49 @@
                 </a>
             </td>
             <td>
+                {{-- The button triggers a modal dialog in which the user can provide an explanation about the problem. --}}
+
+                {{-- modal trigger --}}
+                <a @class([
+                    'btn',
+                    'waves-effect',
+                    'waves-light',
+                    'modal-trigger',
+                    'right',
+                    'coli' => !$item->out_of_order,
+                    'blue' => !$item->out_of_order,
+                ]) class="" href="#fault-reporting-modal-{{ $item->id }}">{{ __($item->out_of_order ? 'reservations.report_fix' : 'reservations.report_fault') }}</a>
+
+                {{-- modal structure --}}
                 <form method="POST"
                 action="{{ route('reservations.items.report_fault', ['item' => $item]) }}"
                 enctype='multipart/form-data'>
                     @csrf
-                    <x-input.button floating @class([
-                        'right', 'btn-small',
-                        'red' => !$item->out_of_order,
-                        'green' => $item->out_of_order
-                    ]) icon="build" />
+                    <div id="fault-reporting-modal-{{ $item->id }}" class="modal">
+                        <div class="modal-content">
+                            <h4>{{ __($item->out_of_order ? 'reservations.report_fix' : 'reservations.report_fault') }}</h4>
+                            <x-input.textarea id="message"
+                                      :text="__('general.description')"
+                                      :helper="__('reservations.describe_what_happened')"/>
+                        </div>
+                        <div class="modal-footer">
+                            <a href="#!" type="submit" class="waves-effect btn modal-close">@lang('general.cancel')</a>
+                            <button class="waves-effect btn modal-close" type="submit">@lang('general.send')</button>
+                        </div>
+                    </div>
                 </form>
+
             </td>
         </tr>
         @endforeach
     </tbody>
 </table>
+
+@push('scripts')
+<script>
+// for the modal dialogs
+$(document).ready(function(){
+    $('.modal').modal();
+});
+</script>
+@endpush
diff --git a/resources/views/emails/reservations/report_reservable_item_fault.blade.php b/resources/views/emails/reservations/report_reservable_item_fault.blade.php
@@ -14,6 +14,10 @@
         @else
         használhatatlannak tűnik.
         @endif
+    </p>
+    <p>A probléma részletes leírása:</p>
+    <blockquote>{{ $message }}</blockquote>
+    <p>
         Kérjük, ellenőrizze, hogy valóban ez-e a helyzet;
         ha igen, <a href="{{ route('reservations.items.show', ['item' => $item]) }}">jelölje meg itt</a>.
     </p>

diff --git a/tests/Feature/ReservationTest.php b/tests/Feature/ReservationTest.php
@@ -845,7 +845,8 @@ public function test_fault_report(): void
                 ]);
 
                 $response = $this->actingAs($collegist)->followingRedirects()->post(
-                    route('reservations.items.report_fault', $item)
+                    route('reservations.items.report_fault', $item),
+                    ['message' => null]
                 );
                 $response->assertStatus(200);
                 $item->refresh();