DONE Update user management view

HE-Arc · Dec 14, 2023 · bcf5799 · bcf5799
1 parent 4460094
commit bcf5799
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 24 deletions.
diff --git a/calm-webserver/app/Http/Controllers/Management/UserManagementController.php b/calm-webserver/app/Http/Controllers/Management/UserManagementController.php
@@ -54,7 +54,7 @@ public function expel(string $orgID, string $userID){
     }
 
     public function add(string $orgID){
-        return view('management.users.show', [
+        return view('management.users.create', [
             "page" => "user management",
             "pageTitle" => "Gestion des utilisateurs",
             "pageDescription" => "Gérez les utilisateurs de votre organisation",
@@ -98,4 +98,15 @@ public function store(Request $request){
             "success" => "Utilisateur $email a été ajouté à l'organisation $organization->name"
         ]);
     }
+
+    public function userDetails(string $orgID, string $userID)
+    {
+
+        return view('management.users.show', [
+            "page" => "user management",
+            "pageTitle" => "Détail de l'utilisateur",
+            "pageDescription" => "Visualiser le détail de votre utilisateur",
+            "orgID" => $orgID,
+        ]);
+    }
 }
diff --git a/calm-webserver/resources/js/app.js b/calm-webserver/resources/js/app.js
@@ -97,6 +97,13 @@ import 'flowbite';
         form.action = "/management/" + button.dataset.orgId + "/users/"+ button.dataset.userId;
     }
 
+    function deleteUserReservation(button, form)
+    {
+        // TODO adding the right route
+        // button.dataset.reservationId
+        form.action = "/management/" + button.dataset.orgId + "/users/"+ button.dataset.userId;
+    }
+
     /**
      * Main program
      */
@@ -111,13 +118,18 @@ import 'flowbite';
         const chooseWashDryCheckboxes = getElements(".choose-wash-dry");
         exclusivesCheckbox(chooseWashDryCheckboxes);
 
-        const adminDeleteUserButton = getElements(".btn-admin-delete-user-account");
-        adminDeleteUserButton.forEach((button) => {
+        const adminDeleteUserButtons = getElements(".btn-admin-delete-user-account");
+        adminDeleteUserButtons.forEach((button) => {
             addEvent(button, "click", () => {
                 deleteUser(button, getElement("#delete-user-account-form"))
             });
         });
 
-        //
+        const adminDeleteUserReservationButtons = getElements(".btn-admin-delete-user-reservation");
+        adminDeleteUserReservationButtons.forEach((button) => {
+            addEvent(button, "click", () => {
+                deleteUserReservation(button, getElement("#delete-user-reservation-form"))
+            });
+        });
     }()); //mainProgram
 }()); //Main IIFE
diff --git a/calm-webserver/resources/views/management/users/create.blade.php b/calm-webserver/resources/views/management/users/create.blade.php
@@ -2,9 +2,7 @@
 @section('content')
 
     <section class="container flex flex-col items-gap-4 w-full mx-auto rounded-sm md:w-1/2">
-
-        <div
-            class="btn btn-transparent">
+        <div class="btn btn-transparent">
             <a class="block align-middle" href="{{ route('management.users.index', $orgID) }}">
                 <svg class="w-2 h-2 text-seaNymph inline" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
                      viewBox="0 0 8 14">

diff --git a/calm-webserver/resources/views/management/users/index.blade.php b/calm-webserver/resources/views/management/users/index.blade.php
@@ -61,17 +61,13 @@ class="p-5 text-justify dark:text-white dark:bg-gray-800">
                                 ----------
                             </td>
                             <td class="px-6 py-4 text-center">
-                                <form action="#" method="post">
-                                    @csrf
-                                    <input type="hidden" name="id" value="">
-                                    <button type="submit" class="btn btn-sobre flex w-full justify-center">
-                                        Détail
-                                    </button>
-                                </form>
+                                <a class="btn btn-sobre flex w-full justify-center" href="{{ route('management.users.userDetails', [$orgID, $user->id]) }}">Détails</a>
                             </td>
                             <td class="px-6 py-4 text-center">
-                                <button type="submit" class="btn btn-sobre flex w-full justify-center btn-admin-delete-user-account" data-modal-target="user-account-delete-confirm-modal"
-                                        data-modal-show="user-account-delete-confirm-modal" data-org-id="{{$orgID}}" data-user-id="{{$user->id}}">
+                                <button type="submit" class="btn btn-sobre flex w-full justify-center btn-admin-delete-user-account"
+                                        data-modal-target="user-account-delete-confirm-modal"
+                                        data-modal-show="user-account-delete-confirm-modal"
+                                        data-org-id="{{$orgID}}" data-user-id="{{$user->id}}">
                                     Supprimer
                                 </button>
                             </td>
@@ -114,5 +110,4 @@ class="p-5 text-justify dark:text-white dark:bg-gray-800">
         </form>
     </x-slot>
 </x-modal>
-
 @endsection
diff --git a/calm-webserver/resources/views/management/users/show.blade.php b/calm-webserver/resources/views/management/users/show.blade.php
@@ -53,18 +53,45 @@ class="inline-flex items-center btn btn-sobre">
                         </td>
                         <td class="px-6 py-4 text-center">
                             <!-- Route to delete user reservation -->
-                            <form action="#" method="post">
-                                @csrf
-                                <input type="hidden" name="id" value="">
-                                <button type="submit" class="btn btn-sobre flex w-full justify-center">
-                                    Supprimer
-                                </button>
-                            </form>
+                            <button type="submit" class="btn btn-sobre flex w-full justify-center btn-admin-delete-user-reservation"
+                                    data-modal-target="delete-user-reservation-modal"
+                                    data-modal-show="delete-user-reservation-modal"
+                                    data-org-id="#TODO" data-user-id="#TODO" data-reservation-id="#TODO">
+                                <!-- TODO Changer the route inside the app.js function deleteUserReservation -->
+                                Supprimer
+                            </button>
                         </td>
                     </tr>
                     <!-- endforeach-->
                 </tbody>
             </table>
         </div>
     </section>
+
+    <x-modal>
+        @slot('id', 'delete-user-reservation-modal')
+        @slot('form', 'delete-user-reservation-form')
+        @slot('icon', 'warning')
+        @slot('confirm', 'Supprimer')
+        @slot('close', 'Annuler')
+        @slot('closable', true)
+        @slot('header', 'Supprimer la réservation de l\'utilisateur')
+        <x-slot name="body">
+            <form id="delete-user-reservation-form" action="" method="post">
+                @csrf
+                @method('DELETE')
+
+                <input type="hidden" name="id" value="">
+
+                <p class="text-gray-500"><strong>!!! ATTENTION !!! </strong> Vous êtes sur le point de
+                    <strong>DÉFINITIVEMENT</strong> supprimer la réservation de cet utilisateur ! <br>
+                    Cette action est <strong>IRRÉVERSIBLE</strong> ! La réservation sera définitivement supprimée !
+                    <br>
+                    <strong>
+                        Êtes-vous sûr de vouloir continuer ?
+                    </strong>
+                </p>
+            </form>
+        </x-slot>
+    </x-modal>
 @endsection
diff --git a/calm-webserver/routes/web.php b/calm-webserver/routes/web.php
@@ -49,6 +49,7 @@
 Route::delete('management/{org}/users/{id}', [UserManagementController::class, 'expel'])->middleware('auth')->can('admin')->name('management.users.expel');
 Route::post("management/{org}/users", [UserManagementController::class, 'store'])->middleware('auth')->can('admin')->name('management.users.store');
 Route::get("management/{org}/users/add", [UserManagementController::class, 'add'])->middleware('auth')->can('admin')->name('management.users.add');
+Route::get('management/{org}/users/{id}', [UserManagementController::class, 'userDetails'])->middleware('auth')->can('admin')->name('management.users.userDetails');
 
 // LAUNDRIES MANAGEMENT
 Route::get("management/{orgId}/laundries", [\App\Http\Controllers\Management\LaundryController::class, 'index'])->middleware('auth')->can('admin')->name('management.laundries.index');