diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index a7ba8d6eac4accba2a5c5d30a4a881a46f72d19a..034aa0197abfcb45d91b882c007b4f29e4874080 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -65,8 +65,18 @@
                     </div>
                     @endif
                     <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 " value="{{$tgl}}" required>
+                        <div class="col text-right">
+                            <label for="tanggal_waktu" class="text-md-right text-center">Waktu Bimbingan<sup>*</sup></label>
+                        </div>
+                        <div style="overflow:hidden;" class="col-md-8">
+                                <div class="form-group">
+                                    <div class="row">
+                                        <div class="col-md-10">
+                                            <div id="datetimepickercomponent1"></div>
+                                        </div>
+                                    </div>
+                                </div>         
+                        </div>
                     </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>
@@ -77,10 +87,22 @@
                         <textarea class="form-control col-md-8" name="rencana_tindak_lanjut" form="form-hsl-bimbingan" required>{{$rencana}}</textarea>
                     </div>
                     <div class="form-group row col-md-12">
-                        <label for="waktu_bimbingan_selanjutnya" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan Selanjutnya</label>
-                        <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}">
+                        <div class="col text-right">
+                            <label for="waktu_bimbingan_selanjutnya" class="text-md-right text-center">Waktu Bimbingan Selanjutnya</label>
+                        </div>
+                        <div style="overflow:hidden;" class="col-md-8">
+                                <div class="form-group">
+                                    <div class="row">
+                                        <div class="col-md-10">
+                                            <div id="datetimepickercomponent2"></div>
+                                        </div>
+                                    </div>
+                                </div>         
+                        </div>
                     </div>
                 </div>
+                <input type="hidden" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required>
+                <input type="hidden" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}">
 
             </form>
             <span><sup>*</sup>Wajib diisi</span>
@@ -90,4 +112,76 @@
             </div>
         </div>
     </div>
+@endsection
+
+@section('bottomjs')
+    <!-- Preparing datetimepicker -->
+    <script type="text/javascript">
+        $(function () {
+            if ($('#tanggal_waktu').val() != ""){
+                console.log("haloo")
+                $('#datetimepickercomponent1').datetimepicker({
+                    inline: true,
+                    sideBySide: true, 
+                    useCurrent: false,
+                    defaultDate: $('#tanggal_waktu').val(),
+                    icons: {
+                        time: 'fa fa-clock-o',
+                        date: 'fa fa-calendar',
+                        up: 'fa fa-chevron-up',
+                        down: 'fa fa-chevron-down',
+                        next: 'fa fa-chevron-right',
+                        previous: 'fa fa-chevron-left'},
+                });
+            } else{
+                $('#datetimepickercomponent1').datetimepicker({
+                    inline: true,
+                    sideBySide: true,
+                    icons: {
+                        time: 'fa fa-clock-o',
+                        date: 'fa fa-calendar',
+                        up: 'fa fa-chevron-up',
+                        down: 'fa fa-chevron-down',
+                        next: 'fa fa-chevron-right',
+                        previous: 'fa fa-chevron-left'},
+                });
+            }
+        });
+
+        $(function () {
+            if ($('#waktu_bimbingan_selanjutnya').val() != ""){
+                $('#datetimepickercomponent2').datetimepicker({
+                    inline: true,
+                    sideBySide: true, 
+                    useCurrent: false,
+                    defaultDate: $('#waktu_bimbingan_selanjutnya').val(),
+                    icons: {
+                        time: 'fa fa-clock-o',
+                        date: 'fa fa-calendar',
+                        up: 'fa fa-chevron-up',
+                        down: 'fa fa-chevron-down',
+                        next: 'fa fa-chevron-right',
+                        previous: 'fa fa-chevron-left'},
+                });
+            } else {
+                $('#datetimepickercomponent2').datetimepicker({
+                    inline: true,
+                    sideBySide: true, 
+                    icons: {
+                        time: 'fa fa-clock-o',
+                        date: 'fa fa-calendar',
+                        up: 'fa fa-chevron-up',
+                        down: 'fa fa-chevron-down',
+                        next: 'fa fa-chevron-right',
+                        previous: 'fa fa-chevron-left'},
+                });
+            }
+        });
+    </script>
+    <script>
+        $('#form-hsl-bimbingan').submit(function(){
+            $('#tanggal_waktu').val($('#datetimepickercomponent1').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'));
+            $('#waktu_bimbingan_selanjutnya').val($('#datetimepickercomponent2').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'));
+        })
+    </script>
 @endsection
\ No newline at end of file