diff --git a/app/Http/Controllers/HasilBimbinganController.php b/app/Http/Controllers/HasilBimbinganController.php
index 3b4bdae115e381c2bb9e4da57a188b4507608c32..f51e913abd2c79e2eeb5f01764a582036ecdfef3 100644
--- a/app/Http/Controllers/HasilBimbinganController.php
+++ b/app/Http/Controllers/HasilBimbinganController.php
@@ -88,6 +88,12 @@ class HasilBimbinganController extends Controller
 
     public function editHasilBimbingan(Request $request){
         $mahasiswa = Auth::user()->isMahasiswa();
+        if(isset($_POST['tanggal_waktu'])){
+            $sched1 = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+        }
+        if(isset($_POST['waktu_bimbingan_selanjutnya'])){
+            $sched2 = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+        }
         if($mahasiswa) {
             $user = Auth::user();
             $data = $request->all();
@@ -104,14 +110,14 @@ class HasilBimbinganController extends Controller
                 if ($db_hsl_bimbingan->count() >= $ok_count) {
                     $cur = $db_hsl_bimbingan[$ok_count - 1];
                     $cur->dosen_id = $data['dosen_id'];
-                    $cur->tanggal_waktu = $data['tanggal_waktu'];
+                    $cur->tanggal_waktu = $sched1;
                     $cur->topik = $data['topik'];
                     $cur->hasil_dan_diskusi = $data['hasil_dan_diskusi'];
                     $cur->rencana_tindak_lanjut = $data['rencana_tindak_lanjut'];
                     if($item_count > 8){
                         $cur->dosen_id2 = $data['dosen_id2'];
                     }
-                    $cur->waktu_bimbingan_selanjutnya = $data['waktu_bimbingan_selanjutnya'];
+                    $cur->waktu_bimbingan_selanjutnya = $sched2;
                     $cur->save();
                 }
             }
@@ -128,13 +134,19 @@ class HasilBimbinganController extends Controller
 
     public function uploadHasilBimbinganBaru(Request $request) {
         $mahasiswa = Auth::user()->isMahasiswa();
+        
         if($mahasiswa) {
             $user = Auth::user();
             $data = $request->all();
             $ok_count = 0;
             $tesis = $mahasiswa->tesis();
             $item_count = count($data);
-
+            if(isset($_POST['tanggal_waktu'])){
+                $sched1 = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+            }
+            if(isset($_POST['waktu_bimbingan_selanjutnya'])){
+                $sched2 = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+            }
             $validator = $this->validateHasilBimbingan($data);
             if ($validator->fails()) {
                 echo json_encode($validator->errors());
@@ -144,15 +156,16 @@ class HasilBimbinganController extends Controller
                 if($item_count > 8){
                     $dosen2 = $data['dosen_id2'];
                 }
+                
                 $hasil_bimbingan = HasilBimbingan::create([
                     'dosen_id' => $data['dosen_id'],
                     'status' => 0,
-                    'tanggal_waktu' => $data['tanggal_waktu'],
+                    'tanggal_waktu' => $sched1,
                     'topik' => $data['topik'],
                     'hasil_dan_diskusi' => $data['hasil_dan_diskusi'],
                     'rencana_tindak_lanjut' => $data['rencana_tindak_lanjut'],
                     'dosen_id2' => $dosen2,
-                    'waktu_bimbingan_selanjutnya' => $data['waktu_bimbingan_selanjutnya'],
+                    'waktu_bimbingan_selanjutnya' => $sched2,
                     'thesis_id' => $tesis->id
                 ]);
             }
diff --git a/app/Http/Controllers/SeminarTesisController.php b/app/Http/Controllers/SeminarTesisController.php
index a2339fc6da746a656800079c452bfe5aae2cfec6..5e424cc084a8be88a6364a7c5e553e568f491a5c 100644
--- a/app/Http/Controllers/SeminarTesisController.php
+++ b/app/Http/Controllers/SeminarTesisController.php
@@ -36,6 +36,10 @@ class SeminarTesisController extends Controller
       $usr = User::where('username',$id)->first();
       $mhs = $usr->isMahasiswa();
       $tesis = $mhs->tesis();
+      if(isset($_POST['haritgl'])){
+        $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+        $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+        } 
       if(!$usr || !$mhs || !$tesis) {
           return abort(400);
       } else {
@@ -45,14 +49,17 @@ class SeminarTesisController extends Controller
               $name = $request->get('name');
               $nim = $request->get('nim');
               $judul = $request->get('judul');
-              $hari = $request->get('haritgl');
-              $waktu = $request->get('waktu');
+              $hari = $sched;
+            //   $request->get('haritgl');
+              $waktu = $sched1;
+            //   $request->get('waktu');
               $tempat = $request->get('tempat');
               $st = SeminarTesis::create([
                   'tesis_id' => $mhs->tesis()->id,
                   'issuer_id' => Auth::user()->id,
-                  'hari' => $hari,
-                  'waktu'=> $waktu,
+                  'hari' => $sched,
+                //   $hari,
+                  'waktu'=> $sched1,
                   'tempat' => $tempat,
                   'approval_pembimbing1' => $db1,
                   'approval_pembimbing2' => $db2,
@@ -73,6 +80,10 @@ class SeminarTesisController extends Controller
         $usr = User::where('username',$id)->first();
         $mhs = $usr->isMahasiswa();
         $tesis = $mhs->tesis();
+        if(isset($_POST['haritgl'])){
+            $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+            $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+        } 
         if(!$usr || !$mhs || !$tesis) {
             return abort(400);
         } else {
@@ -87,8 +98,10 @@ class SeminarTesisController extends Controller
                 if($request->get('approval_db1') && $db1) {
                     $st->approval_pembimbing1 = true;
                 }
-                $st->waktu = $request->get('waktu');
-                $st->hari = $request->get('haritgl');
+                $st->waktu = $sched1;
+                // $request->get('waktu');
+                $st->hari = $sched; 
+                // $request->get('haritgl');
                 $st->tempat = $request->get('tempat');
                 $judul = $request->get('judul');
                 $tesis->judul_thesis = $judul;
diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index 1f6947076d5931a84ebc99f05d4e0394eb65cb14..3414d3ea7c32d332c46ba6d6fae98182c99a58fa 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -482,10 +482,16 @@ class SidangTesisController extends Controller
         $mhs = $usr->isMahasiswa();
         $tesis = $mhs->tesis();
         $sidang = $tesis->sidangTesis();
+        if(isset($_POST['haritgl'])){
+            $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+            $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+        } 
         if($tesis->dosen_pembimbing1 ==  Auth::user()->id || $tesis->dosen_pembimbing2 == Auth::user()->id) {
             print_r($request->all());
-            $sidang->tanggal  = $request->get('haritgl');
-            $sidang->jam  = $request->get('waktu');
+            $sidang->tanggal  = $sched;
+            // $request->get('haritgl');
+            $sidang->jam  = $sched1;
+            // $request->get('waktu');
             $sidang->tempat = $request->get('tempat');
             $tesis->judul_thesis = $request->get('judul');
             $sidang->ajuan_penguji1 = $request->get('usulan_penguji1');
@@ -503,6 +509,9 @@ class SidangTesisController extends Controller
     public function mahasiswaEdit(Request $request, $id){
         $user = User::where('username',$id)->first();
         $mhs = $user->isMahasiswa();
+        if(isset($_POST['tanggal_seminar_tesis'])){
+            $sched = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_seminar_tesis']));
+        } 
         if($mhs->id == Auth::user()->id && $mhs->tesis() && $mhs->tesis()->sidangTesis()) {
             $sidang = $mhs->tesis()->sidangTesis();
             $eval_diri = $request->file('eval_diri');
@@ -547,6 +556,8 @@ class SidangTesisController extends Controller
 
             $sidang->semester_terdaftar = $request->get('semester_daftar');
 
+            
+
             $sidang->jadwal_seminar = $request->get('tanggal_seminar_tesis');
 
             $sidang->save();
@@ -626,10 +637,16 @@ class SidangTesisController extends Controller
         $mhs = $usr->isMahasiswa();
         $tesis = $mhs->tesis();
         $sidang = $tesis->sidangTesis();
+        if(isset($_POST['haritgl'])){
+            $sched = date("Y-m-d", strtotime($_POST['haritgl']));
+            $sched1 = date("H:i:s", strtotime($_POST['haritgl']));
+        } 
         if(Auth::user()->isManajer()) {
             print_r($request->all());
-            $sidang->tanggal  = $request->get('haritgl');
-            $sidang->jam  = $request->get('waktu');
+            $sidang->tanggal  = $sched;
+            // $request->get('haritgl');
+            $sidang->jam  = $sched1;
+            // $request->get('waktu');
             $sidang->tempat = $request->get('tempat');
             $sidang->dosen_penguji_1 = $request->get('dosen_penguji1');
             $sidang->dosen_penguji_2 = $request->get('dosen_penguji2');  
diff --git a/resources/views/dosen/create_seminartesis.blade.php b/resources/views/dosen/create_seminartesis.blade.php
index 5e0e8244b8694b23d83d580b04dfe16b3274f3a5..69f7dd8d2ea9032919ca0e1638687661ece4625a 100644
--- a/resources/views/dosen/create_seminartesis.blade.php
+++ b/resources/views/dosen/create_seminartesis.blade.php
@@ -31,15 +31,38 @@
                             <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                 Tanggal
                             </label>
-                            <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" >
+                            <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" > -->
+                            <div class="row">
+                                <div class="form-group">
+                                    <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+                                        <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+                                         />
+                                        <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                            <span class="fa fa-calendar"></span>
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                            
                         </div>
 
-                        <div class="form-group row col-md-12">
+                        <!-- <div class="form-group row col-md-12">
                             <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
                                 Waktu
                             </label>
                             <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" >
-                        </div>
+                            <div class="row">
+                                <div class="form-group">
+                                    <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+                                    <input name="waktu" id="haritgl" type="text" class="col-md-8 form-control datetimepicker-input" data-target="#datetimepicker2"/>
+                                    <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                        <span class="fa fa-clock-o"></span>
+                                    </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div> -->
+
 
                         <div class="form-group row col-md-12">
                             <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
@@ -61,3 +84,4 @@
         </div>
     </div>
 @endsection
+
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index ad3adb1de856ef606a408c523222ee3c001a9fa9..50446c4266782a532e926b3ef3a13a78cd2f721f 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -208,16 +208,25 @@
                                         <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                             Tanggal
                                         </label>
-                                        <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" >
+                                        <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" > -->
+                                        <div class="row">
+                                            <div class="form-group">
+                                                <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+                                                    <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input" data-target="#datetimepicker2"
+                                                    value="{{date("m/d/Y", strtotime($sidangTesis->tanggal))}} {{date("g:i A", strtotime($sidangTesis->jam))}}" />
+                                                    <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                                        <span class="fa fa-calendar"></span>
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-
-                                    <div class="form-group row col-md-12">
+                                    <!-- <div class="form-group row col-md-12">
                                         <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
                                             Waktu
                                         </label>
                                         <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input" value="{{$sidangTesis->jam}}">
-                                    </div>
-
+                                    </div> -->
                                     <div class="form-group row col-md-12">
                                         <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
                                             Tempat
@@ -364,16 +373,25 @@
                                 <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                     Tanggal
                                 </label>
-                                <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" >
+                                <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" > -->
+                                <div class="row">
+                                    <div class="form-group">
+                                        <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+                                            <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input-seminar" data-target="#datetimepicker1"
+                                            value="{{date("m/d/Y", strtotime($seminarTesis->hari))}} {{date("g:i A", strtotime($seminarTesis->waktu))}}" />
+                                            <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                                <span class="fa fa-calendar"></span>
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
-
-                            <div class="form-group row col-md-12">
+                            <!-- <div class="form-group row col-md-12">
                                 <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
                                     Waktu
                                 </label>
                                 <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->waktu}}">
-                            </div>
-
+                            </div> -->
                             <div class="form-group row col-md-12">
                                 <label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
                                     Tempat
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index e35b4c1aa42e40c6999c54b51f85472262ad3716..0c3381e03cc498306cdce1369957f70d9b1e0e5c 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -10,7 +10,19 @@
 	function Button_Click() {
     document.getElementById('buttondetail').value = statejs;
         statejs = 1;
-}
+	}
+	
+	$(function () {
+		$('#datetimepicker1').datetimepicker({
+			format: 'L'
+		});
+	});
+
+	$(function () {
+		$('#datetimepicker2').datetimepicker({
+			format: 'LT'
+		});
+	});
 </script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <div class="container"> 
diff --git a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
index aef64f23324c15f5a8fed7a5125641c9291202ae..34c916c9e82d32f31b1422adf91e7225d096b9dd 100644
--- a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
+++ b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
@@ -28,6 +28,7 @@
                         <input type="datetime-local" id="tanggal_seminar_tesis" name="tanggal_seminar_tesis" class="form-control col-md-8 "
                                value="{{date("Y-m-d", strtotime($seminarTesis->hari))}}T{{date("H:i", strtotime($seminarTesis->waktu))}}"
                                required disabled>
+                                
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="" class="col-md-4 col-form-label text-md-right text-center">Dokumen Evaluasi Diri</label>
@@ -151,7 +152,5 @@
                 }
             }
         });
-
-
     </script>
 @endsection
diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index a7ba8d6eac4accba2a5c5d30a4a881a46f72d19a..256298eec4ca9dd7d2375cd4bae7d957e59c1e20 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -66,7 +66,18 @@
                     @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>
+                        <!-- <input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required> -->
+                        <div class="row">
+                            <div class="form-group">
+                                <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+                                <input name="tanggal_waktu" id="tanggal_waktu" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+                                    required />
+                                <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                    <span class="fa fa-calendar"></span>
+                                </span>
+                                </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>
@@ -78,7 +89,17 @@
                     </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}}">
+                        <!-- <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}"> -->
+                        <div class="row">
+                            <div class="form-group">
+                                <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+                                <input name="waktu_bimbingan_selanjutnya" id="waktu_bimbingan_selanjutnya" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2" />
+                                <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                    <span class="fa fa-calendar"></span>
+                                </span>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index db41483e5a166cef2e49909e36d8b29f8a6e3c1b..c0d9b996192d93c85f590f53d7f7320bc152507d 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -173,10 +173,10 @@
                                                         <div class="container">
                                                             <div class="row">
                                                                 <div class="form-group">
-                                                                    <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
-                                                                    <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+                                                                    <div class="input-group date" id="datetimepicker3" data-target-input="nearest">
+                                                                    <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker3"
                                                                         />
-                                                                    <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                                                    <span class="input-group-addon" data-target="#datetimepicker3" data-toggle="datetimepicker">
                                                                         <span class="fa fa-calendar"></span>
                                                                     </span>
                                                                     </div>
@@ -509,10 +509,10 @@
                                                         <div class="container">
                                                             <div class="row">
                                                                 <div class="form-group">
-                                                                    <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
-                                                                    <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2"
+                                                                    <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+                                                                    <input name="date" id="date" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker4"
                                                                         />
-                                                                    <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                                                    <span class="input-group-addon" data-target="#datetimepicker4" data-toggle="datetimepicker">
                                                                         <span class="fa fa-calendar"></span>
                                                                     </span>
                                                                     </div>
@@ -801,15 +801,26 @@
                                                                     <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                                                         Tanggal
                                                                     </label>
-                                                                    <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" >
+                                                                    <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->hari}}" > -->
+                                                                    <div class="row">
+                                                                        <div class="form-group">
+                                                                            <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+                                                                                <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input-seminar" data-target="#datetimepicker1"
+                                                                                value="{{date("m/d/Y", strtotime($seminarTesis->hari))}} {{date("g:i A", strtotime($seminarTesis->waktu))}}" />
+                                                                                <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                                                                    <span class="fa fa-calendar"></span>
+                                                                                </span>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
                                                                 </div>
 
-                                                                <div class="form-group row col-md-12">
+                                                                <!-- <div class="form-group row col-md-12">
                                                                     <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
                                                                         Waktu
                                                                     </label>
                                                                     <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input-seminar" value="{{$seminarTesis->waktu}}">
-                                                                </div>
+                                                                </div> -->
 
                                                                 <div class="form-group row col-md-12">
                                                                     <label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
@@ -1597,15 +1608,26 @@
                                                             <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                                                 Tanggal
                                                             </label>
-                                                            <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" >
+                                                            <!-- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" value="{{$sidangTesis->tanggal}}" > -->
+                                                            <div class="row">
+                                                                <div class="form-group">
+                                                                    <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+                                                                        <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input" data-target="#datetimepicker2"
+                                                                        value="{{date("m/d/Y", strtotime($sidangTesis->tanggal))}} {{date("g:i A", strtotime($sidangTesis->jam))}}" />
+                                                                        <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                                                            <span class="fa fa-calendar"></span>
+                                                                        </span>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
                                                         </div>
 
-                                                        <div class="form-group row col-md-12">
+                                                        <!-- <div class="form-group row col-md-12">
                                                             <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
                                                                 Waktu
                                                             </label>
                                                             <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input" value="{{$sidangTesis->jam}}">
-                                                        </div>
+                                                        </div> -->
 
                                                         <div class="form-group row col-md-12">
                                                             <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index 0ce964849c3d79d728c61a7572b2510783b90139..7c6d1ea437c0038abe5172d95c30a7c6a561f221 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -69,6 +69,19 @@
                                         <input type="hidden" id="id{{$item->topic->mahasiswa_id}}" name="id{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic->mahasiswa_id}}">
                                         <input type="hidden" id="tp{{$item->topic->mahasiswa_id}}" name="tp{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic_id}}">
                                         <input type="datetime-local" id="sch{{$item->topic->mahasiswa_id}}" name="sch{{$item->topic->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton()">
+                                        <!-- <div class="container">
+                                            <div class="row">
+                                                <div class="form-group">
+                                                    <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+                                                    <input name="sch{{$item->topic->mahasiswa_id}}" id="sch{{$item->topic->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1"
+                                                        onkeyup="updateSaveButton() />
+                                                    <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                                        <span class="fa fa-calendar"></span>
+                                                    </span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div> -->
                                     </td>
                                 </tr>
                                 @php($count++)
@@ -97,6 +110,19 @@
                                                 <input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
                                                 <input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topik_id}}">
                                                 <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton()">
+                                                <!-- <div class="container">
+                                                    <div class="row">
+                                                        <div class="form-group">
+                                                            <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+                                                            <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2"
+                                                                value={{$tgl}} onkeyup="updateSaveButton() />
+                                                            <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                                                <span class="fa fa-calendar"></span>
+                                                            </span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div> -->
                                             </td>
                                         </tr>
                                         @php($no++)
@@ -177,6 +203,19 @@
                                         <input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
                                         <input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id}}">
                                         <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton2()">
+                                        <!-- <div class="container">
+                                            <div class="row">
+                                                <div class="form-group">
+                                                    <div class="input-group date" id="datetimepicker3" data-target-input="nearest">
+                                                    <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker3"
+                                                        onkeyup="updateSaveButton2() />
+                                                    <span class="input-group-addon" data-target="#datetimepicker3" data-toggle="datetimepicker">
+                                                        <span class="fa fa-calendar"></span>
+                                                    </span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div> -->
                                     </td>
                                 </tr>
                                 @php($count++)
@@ -205,6 +244,19 @@
                                                 <input type="hidden" id="pb{{$item->mahasiswa_id}}" name="pb{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_pembimbing_2}}">
                                                 <input type="hidden" id="pg{{$item->mahasiswa_id}}" name="pg{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_penguji}}">
                                                 <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton2()">
+                                                <!-- <div class="container">
+                                                    <div class="row">
+                                                        <div class="form-group">
+                                                            <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+                                                            <input name="sch{{$item->mahasiswa_id}}" id="sch{{$item->mahasiswa_id}}" type="text" class="form-control datetimepicker-input" data-target="#datetimepicker4"
+                                                                onkeyup="updateSaveButton2() />
+                                                            <span class="input-group-addon" data-target="#datetimepicker4" data-toggle="datetimepicker">
+                                                                <span class="fa fa-calendar"></span>
+                                                            </span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div> -->
                                             </td>
                                         </tr>
                                         @php($no++)