diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index b4e285339cb04e4a3fd1a1118a5ccbf800fdafbb..6a48081883e0303152307d39541bf48399a1bd58 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -1,6 +1,21 @@
 @extends('layouts.app')
 @section('title','Hasil Bimbingan')
 
+@php
+    if(count($hsl_bimbingan) > 0){
+        $tgl = $hsl_bimbingan[0]->tanggal_waktu;
+        $tgl = substr(str_replace(" ","T",$tgl),0,16);
+        $topik = $hsl_bimbingan[0]->topik;
+        $diskusi = $hsl_bimbingan[0]->hasil_dan_diskusi;
+        $rencana = $hsl_bimbingan[0]->rencana_tindak_lanjut;
+    }else{
+        $tgl = "";
+        $topik = "";
+        $diskusi = "";
+        $rencana = "";
+    }
+@endphp
+
 @section('content')
     <div class="container">
         <h2  class="text-center">Formulir Hasil Bimbingan</h2>
@@ -11,7 +26,7 @@
                 <div class="form-group">
                     <div class="form-group row col-md-12">
                         <label for="topik" class="col-md-4 col-form-label text-md-right text-center">Topik Bimbingan<sup>*</sup></label>
-                        <input type="text" id="topik" name="topik" class="form-control col-md-8 " required>
+                        <input type="text" id="topik" name="topik" class="form-control col-md-8 " value="{{$topik}}" required>
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="dosen_id" class="col-md-4 col-form-label text-md-right text-center ">Dosen Pembimbing<sup>*</sup></label>
@@ -20,21 +35,29 @@
                             <option value=""></option>
                             @foreach($dosen as $item)
                                 @php($user_item = $item->user())
-                                <option value="{{$user_item->id}}">{{$user_item->name}}</option>
+                                @if(count($hsl_bimbingan) > 0)
+                                    @if($hsl_bimbingan[0]->dosen_id == $user_item->id)
+                                        <option value="{{$user_item->id}}" selected="selected">{{$user_item->name}}</option>
+                                    @else
+                                        <option value="{{$user_item->id}}">{{$user_item->name}}</option>
+                                    @endif
+                                @else
+                                    <option value="{{$user_item->id}}">{{$user_item->name}}</option>
+                                @endif
                             @endforeach
                         </select>
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="tanggal_waktu" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan<sup>*</sup></label>
-                        <input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " required>
+                        <input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required>
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="hasil_dan_diskusi" class="col-md-4 col-form-label text-md-right text-center ">Hasil dan Diskusi<sup>*</sup></label>
-                        <input type="text" id="hasil_dan_diskusi" name="hasil_dan_diskusi" class="form-control col-md-8 " required>
+                        <input type="text" id="hasil_dan_diskusi" name="hasil_dan_diskusi" class="form-control col-md-8 " value="{{$diskusi}}" required>
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="rencana_tindak_lanjut" class="col-md-4 col-form-label text-md-right text-center ">Rencana Tindak Lanjut<sup>*</sup></label>
-                        <input type="text" id="rencana_tindak_lanjut" name="rencana_tindak_lanjut" class="form-control col-md-8 " required>
+                        <input type="text" id="rencana_tindak_lanjut" name="rencana_tindak_lanjut" class="form-control col-md-8 " value="{{$rencana}}" required>
                     </div>
                 </div>
 
diff --git a/resources/views/mahasiswa/list_hasil_bimbingan.blade.php b/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
index 25d48984601f1123af751133162a4512ada1b522..ea21d26e75bafa6281d76b144586923ccec3f612 100644
--- a/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
@@ -34,16 +34,18 @@
                         <td>
                             {{$item->getStatusString()}}
                         </td>
-                        <td class="row justify-content-center ">
-                            <a href="/hasilbimbingan/{{$item->id}}">
-                                <button class="btn btn-primary display-flex justify-content-center align-items-center">
-                                    <i class="material-icons font-size-18-px">
-                                        edit
-                                    </i>
-                                    <span class="ml-1">Edit</span>
-                                </button>
-                            </a>
-                        </td>
+                        @if($item->status == 0)
+                            <td class="row justify-content-center ">
+                                <a href="/hasilbimbingan/tambah">
+                                    <button class="btn btn-primary display-flex justify-content-center align-items-center">
+                                        <i class="material-icons font-size-18-px">
+                                            edit
+                                        </i>
+                                        <span class="ml-1">Edit</span>
+                                    </button>
+                                </a>
+                            </td>
+                        @endif
                     </tr>
                 @endforeach
             </table>