Merge pull request #30 from Yunnie-pin/dev

debugging dynamic parameter pemeriksaan
Yunnie-pin · Aug 1, 2023 · b064b06 · b064b06
2 parents 876277e + 30758a0
commit b064b06
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/app/Http/Controllers/RegistrasiPemeriksaanController.php b/app/Http/Controllers/RegistrasiPemeriksaanController.php
@@ -50,7 +50,7 @@ public function store(Request $request)
         $validateData['status_id'] = 1;
 
         if($keterangan == null){
-            return redirect('/dashboard')->with('error', 'Pemeriksaan gagal ditambahkan, silahkan tambahkan keterangan');
+            return redirect('/registrasi-pemeriksaan')->with('error', 'Pemeriksaan gagal ditambahkan, silahkan tambahkan keterangan');
         }
 
         $result = Pemeriksaan::create($validateData);
@@ -67,7 +67,7 @@ public function store(Request $request)
         $request->session()->forget('requestKeterangan');
         $request->session()->forget('keterangan');
 
-        return redirect('/dashboard')->with('success', 'Pemeriksaan telah berhasil ditambahkan');
+        return redirect('/registrasi-pemeriksaan')->with('success', 'Pemeriksaan telah berhasil ditambahkan');
     }
 
     public function getDataPasien($id){

diff --git a/app/Http/Livewire/DynamicRegistrasiPemeriksaan.php b/app/Http/Livewire/DynamicRegistrasiPemeriksaan.php
@@ -30,6 +30,17 @@ public function add($i)
         $metode = json_decode($this->metodeId);
         $parameter = json_decode($this->parameterId);
 
+        if($bidang == null){
+            return redirect('/registrasi-pemeriksaan')->with('errorForm', 'Pemeriksaan gagal ditambahkan, silahkan tambahkan pilinh bidang pemeriksaaan');
+        }
+        if($metode == null){
+            return redirect('/registrasi-pemeriksaan')->with('errorForm', 'Pemeriksaan gagal ditambahkan, silahkan tambahkan pilinh metode pemeriksaaan');
+        }
+        if($parameter == null){
+            return redirect('/registrasi-pemeriksaan')->with('errorForm', 'Pemeriksaan gagal ditambahkan, silahkan tambahkan pilinh parameter pemeriksaaan');
+        }
+
+
         array_push($this->input, [
             'bidang' => $bidang->name,
             'metode' => $metode->name,

diff --git a/resources/views/livewire/dynamic-registrasi-pemeriksaan.blade.php b/resources/views/livewire/dynamic-registrasi-pemeriksaan.blade.php
@@ -42,6 +42,12 @@
         </div>
     </div>
 
+    @if (session()->has('errorForm'))
+                        <div class="alert alert-danger p-2" role="alert">
+                            {{ session('errorForm') }}
+                        </div>
+    @endif
+
     <table id="myTable" class="table table-striped border-primary table-hover table-bordered">
         <thead>
             <tr>
@@ -63,6 +69,7 @@
                 <td>{{ $value['parameter'] }}</td>
                 <td>{{ $value['harga'] }}</td>
                 <td>
+
                     <button wire:click="remove({{ $key }})" class="btn btn-danger" onclick="return confirm('Apakah Anda yakin ingin menghapus pemeriksaan ini?')">
                         <i class="bi bi-trash3"></i>
                     </button>

diff --git a/resources/views/rolesviews/poli/registrasipemeriksaan.blade.php b/resources/views/rolesviews/poli/registrasipemeriksaan.blade.php
@@ -17,6 +17,19 @@
             <div class="col-lg-12">
                 <div class="row">
                     <div class="card">
+
+                        @if (session()->has('success'))
+                        <div class="alert alert-success p-2" role="alert">
+                            {{ session('success') }}
+                        </div>
+                        @endif
+
+                        @if (session()->has('error'))
+                        <div class="alert alert-danger p-2" role="alert">
+                            {{ session('error') }}
+                        </div>
+                        @endif
+
                         <div class="card-body p-3">
 
                             <div class="row">

diff --git a/routes/web.php b/routes/web.php
@@ -119,4 +119,3 @@
 
 Route::get('/getDataPasien/{id}', [RegistrasiPemeriksaanController::class, 'getDataPasien'])->middleware('laborat');
 
-