Merge pull request #23 from Yunnie-pin/dev

Merge Authentication to server
Yunnie-pin · Jul 5, 2023 · 088b7b5 · 088b7b5
2 parents d3555cc + 7b8b1d6
commit 088b7b5
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 72 deletions.
diff --git a/app/Http/Controllers/RiwayatPemeriksaanController.php b/app/Http/Controllers/RiwayatPemeriksaanController.php
@@ -67,4 +67,10 @@ public function destroy(pemeriksaan $pemeriksaan)
     {
         //
     }
+
+    public function search($search){
+        $dataPemeriksaan = Pemeriksaan::where('status_id', 'like', '%'.$search.'%')->paginate(10);
+        return view('riwayatPemeriksaan', ['dataPemeriksaan' => $dataPemeriksaan]);
+    }
+
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -63,5 +63,9 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'superadmin' => \App\Http\Middleware\isSuperAdmin::class,
+        'administrasi' => \App\Http\Middleware\isAdministrasi::class,
+        'poli' => \App\Http\Middleware\isPoli::class,
+        'laborat' => \App\Http\Middleware\isLaborat::class,
     ];
 }
diff --git a/app/Http/Middleware/isAdministrasi.php b/app/Http/Middleware/isAdministrasi.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class isAdministrasi
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if ((!auth()->check()) || (auth()->user()->roles->name != 'Super Admin') && (auth()->user()->roles->name != 'Administrasi'  ) ){
+            abort(403);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/isLaborat.php b/app/Http/Middleware/isLaborat.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class isLaborat
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if ((!auth()->check()) || (auth()->user()->roles->name != 'Super Admin') && (auth()->user()->roles->name != 'Laborat'  ) ){
+            abort(403);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/isPoli.php b/app/Http/Middleware/isPoli.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class isPoli
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if ((!auth()->check()) || (auth()->user()->roles->name != 'Super Admin') && (auth()->user()->roles->name != 'Poli'  ) ){
+            abort(403);
+        }
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/isSuperAdmin.php b/app/Http/Middleware/isSuperAdmin.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class isSuperAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (!auth()->check() || auth()->user()->roles->name != 'Super Admin') {
+            abort(403);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
@@ -19,13 +19,13 @@
             <div class="row">
                 <div class="card">
                     @if (session()->has('success'))
-                    <div class="alert alert-success" role="alert">
+                    <div class="alert alert-success p-1" role="alert">
                         {{ session('success') }}
                     </div>
                     @endif
 
                     @if (session()->has('error'))
-                    <div class="alert alert-danger" role="alert">
+                    <div class="alert alert-danger p-1" role="alert">
                         {{ session('error') }}
                     </div>
                     @endif

diff --git a/resources/views/partials/navbar.blade.php b/resources/views/partials/navbar.blade.php
@@ -27,7 +27,7 @@
                 <li>
                     <a class="dropdown-item d-flex align-items-center" href="users-profile.html">
                         <i class="bi bi-gear"></i>
-                        <span>Settings</span>
+                        <span>Settings Profile</span>
                     </a>
                 </li> --}}
                 <li>

diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php
@@ -16,35 +16,37 @@
         <hr>
 
 
-        <li class="nav-heading">Super Admin Pages</li>
-
-        <li class="nav-item">
-            <a class="nav-link " href="{{ route('list-user') }}">
-                <i class="bi bi-grid"></i>
-                <span>Data Petugas / User</span>
-            </a>
-        </li><!-- End Dashboard Nav -->
-        <li class="nav-item">
-            <a class="nav-link " href="{{ route('list-bidang') }}">
-                <i class="bi bi-grid"></i>
-                <span>Data Bidang Pemeriksaan</span>
-            </a>
-        </li><!-- End Dashboard Nav -->
-        <li class="nav-item">
-            <a class="nav-link " href="{{ route('list-metode') }}">
-                <i class="bi bi-grid"></i>
-                <span>Data Metode Pemeriksaan</span>
-            </a>
-        </li><!-- End Dashboard Nav -->
-        <li class="nav-item">
-            <a class="nav-link " href="{{ route('list-parameter') }}">
-                <i class="bi bi-grid"></i>
-                <span>Data Parameter </span>
-            </a>
-        </li><!-- End Dashboard Nav -->
+        @if (auth()->user()->roles->name == 'Super Admin' || auth()->user()->roles->name == 'Super Admin')
+            <li class="nav-heading">Super Admin Pages</li>
+
+            <li class="nav-item">
+                <a class="nav-link " href="{{ route('list-user') }}">
+                    <i class="bi bi-grid"></i>
+                    <span>Data Petugas / User</span>
+                </a>
+            </li><!-- End Dashboard Nav -->
+            <li class="nav-item">
+                <a class="nav-link " href="{{ route('list-bidang') }}">
+                    <i class="bi bi-grid"></i>
+                    <span>Data Bidang Pemeriksaan</span>
+                </a>
+            </li><!-- End Dashboard Nav -->
+            <li class="nav-item">
+                <a class="nav-link " href="{{ route('list-metode') }}">
+                    <i class="bi bi-grid"></i>
+                    <span>Data Metode Pemeriksaan</span>
+                </a>
+            </li><!-- End Dashboard Nav -->
+            <li class="nav-item">
+                <a class="nav-link " href="{{ route('list-parameter') }}">
+                    <i class="bi bi-grid"></i>
+                    <span>Data Parameter </span>
+                </a>
+            </li><!-- End Dashboard Nav -->
+        @endif
 
 
-
+        @if(auth()->user()->roles->name == 'Admininstrasi' || auth()->user()->roles->name == 'Super Admin')
         <li class="nav-heading">Administrasi Pages</li>
 
         <li class="nav-item">
@@ -59,9 +61,9 @@
                 <span>Hasil Pemeriksaan</span>
             </a>
         </li><!-- End Dashboard Nav -->
+        @endif
 
-
-
+        @if(auth()->user()->roles->name == 'Poli' || auth()->user()->roles->name == 'Super Admin')
         <li class="nav-heading">Poli Pages</li>
 
         <li class="nav-item">
@@ -77,7 +79,10 @@
             </a>
         </li><!-- End Dashboard Nav -->
 
+        @endif
+
 
+        @if(auth()->user()->roles->name == 'Laborat' || auth()->user()->roles->name == 'Super Admin')
         <li class="nav-heading">Laborat Pages</li>
 
         <li class="nav-item">
@@ -86,8 +91,7 @@
                 <span>Antrean Pemeriksaan</span>
             </a>
         </li><!-- End Dashboard Nav -->
-
-
+        @endif
 
     </ul>
 

diff --git a/resources/views/riwayatPemeriksaan.blade.php b/resources/views/riwayatPemeriksaan.blade.php
@@ -22,11 +22,19 @@
                             <!-- card -->
                             <div class="row p-3 border border-primary ">
 
-                                <div class="p-3">
-                                    <button type="button" class="btn btn-outline-primary">Belum Diproses</button>
-                                    <button type="button" class="btn btn-outline-warning">Menunggu Direview</button>
-                                    <button type="button" class="btn btn-outline-success">Selesai</button>
-                                    <button type="button" class="btn btn-outline-danger">Dibatalkan</button>
+                                <div class="p-3 row justify-content-start">
+                                    <form class="col" action="{{ route('riwayat-pemeriksaan-search', ['search' => '1']) }}" method="GET">
+                                        <button type="submit" class="btn btn-outline-primary ">Belum Diproses</button>
+                                    </form>
+                                    <form class="col" action="{{ route('riwayat-pemeriksaan-search', ['search' => '2']) }}" method="GET">
+                                        <button type="submit" class="btn btn-outline-warning">Menunggu Direview</button>
+                                    </form>
+                                    <form class="col" action="{{ route('riwayat-pemeriksaan-search', ['search' => '3']) }}" method="GET">
+                                        <button type="submit" class="btn btn-outline-success">Selesai</button>
+                                    </form>
+                                    <form class="col" action="{{ route('riwayat-pemeriksaan-search', ['search' => '4']) }}" method="GET">
+                                        <button type="submit" class="btn btn-outline-danger">Dibatalkan</button>
+                                    </form>
                                 </div>
 
                                 <table id="myTable" class="table table-striped border-primary table-hover table-bordered">
@@ -37,7 +45,6 @@
                                             <th>Dokter</th>
                                             <th>Waktu</th>
                                             <th>Proses</th>
-                                            <th>Aksi</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -64,18 +71,6 @@
                                                 {{ $pemeriksaan->status->name }}
                                             </td>
                                             @endif
-                                            <td><div class="dropdown">
-                                                <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
-                                                  Opsi
-                                                </a>
-
-                                                <ul class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-                                                  <li><a class="dropdown-item" href="#">Cetak Hasil</a></li>
-                                                  <li><a class="dropdown-item" href="#">Cetak Nota </a></li>
-
-                                                </ul>
-                                              </div>
-                                            </td>
                                         </tr>
                                         @endforeach
 

diff --git a/routes/web.php b/routes/web.php
@@ -31,80 +31,80 @@
 */
 
 Route::get('/', function () {
-    return view('welcome');
+    if(!auth()->check()){
+        return redirect()->route('login');
+    }else{
+        return redirect()->route('dashboard');
+    }
 });
 
 Route::get('/login', [LoginController::class,'index'])->name('login')->middleware('guest');
 Route::post('/login', [LoginController::class,'authenticate'])->name('login');
 
 Route::post('/logout', [LogoutController::class,'logout'])->name('logout');
 
-
 Route::get('/dashboard', [DashboardController::class,'index'])->name('dashboard')->middleware('auth');
 
-Route::get('/riwayat-pemeriksaan', [RiwayatPemeriksaanController::class, 'index'])->name('riwayat-pemeriksaan');
+Route::get('/riwayat-pemeriksaan', [RiwayatPemeriksaanController::class, 'index'])->name('riwayat-pemeriksaan')->middleware('auth');
+Route::get('/riwayat-pemeriksaan/{search}', [RiwayatPemeriksaanController::class, 'search'])->name('riwayat-pemeriksaan-search')->middleware('auth');
 
 //Super Admin
 Route::resource('/list-user', ListUserController::class)->names([
     'index' => 'list-user',
     'create' => 'create-user',
     'store' => 'store-user'
-]);;
+])->middleware('superadmin');;
 
 Route::resource('/list-bidang', ListBidangController::class)->names([
     'index' => 'list-bidang',
     'create' => 'create-bidang',
     'store' => 'store-bidang',
-]);
+])->middleware('superadmin');;
 
 Route::resource('/list-metode', ListMetodeController::class)->names([
     'index' => 'list-metode',
     'create' => 'create-metode',
     'store' => 'store-metode'
-]);
+])->middleware('superadmin');;
 
 Route::resource('/list-parameter', ListParameterController::class)->names([
     'index' => 'list-parameter',
     'create' => 'create-parameter',
-]);
+])->middleware('superadmin');
 
 
 //Administrasi
 Route::resource('/list-pasien', ListPasienController::class)->names([
     'index' => 'list-pasien',
     'create' => 'create-pasien',
-]);
+])->middleware('administrasi');
 
 Route::resource('/hasil-pemeriksaan', HasilPemeriksaanController::class)->names([
     'index' => 'hasil-pemeriksaan'
-]);
+])->middleware('administrasi');
 
-Route::get('/cetak-hasil/{id}', [CetakHasilController::class, 'show'])->name('cetak-hasil');
-Route::get('/cetak-nota/{id}', [CetakNotaPemeriksaan::class, 'show'])->name('cetak-nota');
+Route::get('/cetak-hasil/{id}', [CetakHasilController::class, 'show'])->name('cetak-hasil')->middleware('administrasi');
+Route::get('/cetak-nota/{id}', [CetakNotaPemeriksaan::class, 'show'])->name('cetak-nota')->middleware('administrasi');
 
 
 //Poli
 Route::resource('/registrasi-pemeriksaan', RegistrasiPemeriksaanController::class)->names([
     'index' => 'registrasi-pemeriksaan',
     'store' => 'store-pemeriksaan'
-]);
+])->middleware('poli');
 
 Route::resource('/review-pemeriksaan', ReviewPemeriksaanController::class)->names([
     'index' => 'review-pemeriksaan',
-]);
+])->middleware('poli');
 
-Route::get('/dynamic-registrasi-pemeriksaan', DynamicRegistrasiPemeriksaan::class)->name('dynamic-registrasi-pemeriksaan');
+Route::get('/dynamic-registrasi-pemeriksaan', DynamicRegistrasiPemeriksaan::class)->name('dynamic-registrasi-pemeriksaan')->middleware('poli');
 
 //Laborat
 Route::resource('/antrean-pemeriksaan', PemeriksaanController::class)->names([
     'index' => 'list-antrean-pemeriksaan',
     'show' => 'show-antrean-pemeriksaan',
-]);
-
-Route::get('/getDataPasien/{id}', [RegistrasiPemeriksaanController::class, 'getDataPasien']);
+])->middleware('laborat');
 
+Route::get('/getDataPasien/{id}', [RegistrasiPemeriksaanController::class, 'getDataPasien'])->middleware('laborat');
 
 
-// Route::get('/cekking', function () {
-//     return view('login');
-// });