From f81708fae54e49014967bae750b8242c78308832 Mon Sep 17 00:00:00 2001
From: AlifArifin <m.alif.arifin@gmail.com>
Date: Mon, 11 Feb 2019 21:42:30 +0700
Subject: [PATCH] fix date

---
 .../Controllers/HasilBimbinganController.php  |  2 +
 .../Controllers/SeminarTopikController.php    |  2 +
 package-lock.json                             | 41 +++++---
 package.json                                  |  3 +-
 .../views/dosen/create_seminartesis.blade.php | 20 +++-
 .../views/dosen/detail_mahasiswa.blade.php    | 56 ++++++++++-
 resources/views/layouts/app.blade.php         | 96 +++++++++++++++----
 .../mahasiswa/daftar_sidang_tesis.blade.php   | 17 +++-
 .../mahasiswa/form_hasil_bimbingan.blade.php  | 30 +++++-
 .../detail_mahasiswa_control.blade.php        | 90 +++++++++++++++--
 10 files changed, 307 insertions(+), 50 deletions(-)

diff --git a/app/Http/Controllers/HasilBimbinganController.php b/app/Http/Controllers/HasilBimbinganController.php
index 3b4bdae..93b729a 100644
--- a/app/Http/Controllers/HasilBimbinganController.php
+++ b/app/Http/Controllers/HasilBimbinganController.php
@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Log;
 
 class HasilBimbinganController extends Controller
 {
@@ -187,6 +188,7 @@ class HasilBimbinganController extends Controller
     }
 
     private function validateHasilBimbingan($hsl_bimbingan) {
+        Log::debug($hsl_bimbingan);
         return Validator::make($hsl_bimbingan, [
             'dosen_id' => 'required|integer',
             'tanggal_waktu' => 'required|date',
diff --git a/app/Http/Controllers/SeminarTopikController.php b/app/Http/Controllers/SeminarTopikController.php
index 5486069..c4df907 100644
--- a/app/Http/Controllers/SeminarTopikController.php
+++ b/app/Http/Controllers/SeminarTopikController.php
@@ -6,9 +6,11 @@ use App\Mahasiswa;
 use App\SeminarTopik;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 class SeminarTopikController extends Controller
 {
    public function penetapanJadwal(Request $request) {
+       Log::debug($request->get("date"));
        $manajer= Auth::user()->isManajer();
        $mhs_id = $request->get('mahasiswa');
        $mahasiswa = Mahasiswa::find($mhs_id);
diff --git a/package-lock.json b/package-lock.json
index 87cf501..8bca1cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3705,7 +3705,8 @@
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -3726,12 +3727,14 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -3746,17 +3749,20 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -3873,7 +3879,8 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -3885,6 +3892,7 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -3899,6 +3907,7 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -3906,12 +3915,14 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -3930,6 +3941,7 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -4010,7 +4022,8 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -4022,6 +4035,7 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -4107,7 +4121,8 @@
                 "safe-buffer": {
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -4143,6 +4158,7 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -4162,6 +4178,7 @@
                     "version": "3.0.1",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -4205,12 +4222,14 @@
                 "wrappy": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 }
             }
         },
diff --git a/package.json b/package.json
index e0feddb..08db1fe 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "dependencies": {
         "bootstrap-material-datetimepicker": "^2.7.3",
         "bootstrap-material-design": "^4.1.1",
-        "material-design-icons": "^3.0.1"
+        "material-design-icons": "^3.0.1",
+        "moment": "^2.24.0"
     }
 }
diff --git a/resources/views/dosen/create_seminartesis.blade.php b/resources/views/dosen/create_seminartesis.blade.php
index ba7d1f0..9d61b11 100644
--- a/resources/views/dosen/create_seminartesis.blade.php
+++ b/resources/views/dosen/create_seminartesis.blade.php
@@ -31,14 +31,30 @@
                             <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                 Tanggal
                             </label>
-                            <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker" >
+                            <div>
+                                <div class="input-group date"  id="datetimepicker6" class="datetimepicker" data-target-input="nearest">
+                                    <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker6" name="haritgl" id="haritgl"/>
+                                    <div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
+                                        <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                    </div>
+                                </div>
+                            </div>
+                            {{-- <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker" > --}}
                         </div>
 
                         <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="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker" >
+                            <div>
+                                <div class="input-group date"  id="datetimepicker11" class="datetimepicker" data-target-input="nearest">
+                                    <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker11" name="waktu" id="haritgl"/>
+                                    <div class="input-group-append" data-target="#datetimepicker11" data-toggle="datetimepicker">
+                                        <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                    </div>
+                                </div>
+                            </div>
+                            {{-- <input type="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker" > --}}
                         </div>
 
                         <div class="form-group row col-md-12">
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index 056e68b..0df5ef3 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -214,14 +214,38 @@
                                         <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                             Tanggal
                                         </label>
-                                        <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input" value="{{$sidangTesis->tanggal}}" >
+                                        <div>
+                                            <div class="input-group date"  id="datetimepicker7" class="datetimepicker" data-target-input="nearest">
+                                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker7" name="haritgl" id="haritgl"
+                                                @if($sidangTesis->tanggal)
+                                                    value="{{date("Y-m-d", strtotime($sidangTesis->tanggal))}}"
+                                                @endif
+                                                />
+                                                <div class="input-group-append" data-target="#datetimepicker7" data-toggle="datetimepicker">
+                                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        {{-- <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input" value="{{$sidangTesis->tanggal}}" > --}}
                                     </div>
 
                                     <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="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input" value="{{$sidangTesis->jam}}">
+                                        <div>
+                                            <div class="input-group date"  id="datetimepicker12" class="datetimepicker" data-target-input="nearest">
+                                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker12" name="waktu" id="haritgl"
+                                                @if($sidangTesis->jam)
+                                                    value="{{date("H:i:s", strtotime($sidangTesis->jam))}}"
+                                                @endif
+                                                />
+                                                <div class="input-group-append" data-target="#datetimepicker12" data-toggle="datetimepicker">
+                                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        {{-- <input type="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input" value="{{$sidangTesis->jam}}"> --}}
                                     </div>
 
                                     <div class="form-group row col-md-12">
@@ -371,14 +395,38 @@
                                 <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                     Tanggal
                                 </label>
-                                <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input-seminar" value="{{$seminarTesis->hari}}" >
+                                <div>
+                                    <div class="input-group date"  id="datetimepicker8" class="datetimepicker" data-target-input="nearest">
+                                        <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker8" name="haritgl" id="haritgl"
+                                        @if($seminarTesis->hari)
+                                            value="{{date("Y-m-d", strtotime($seminarTesis->hari))}}"
+                                        @endif
+                                        />
+                                        <div class="input-group-append" data-target="#datetimepicker8" data-toggle="datetimepicker">
+                                            <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                {{-- <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input-seminar" value="{{$seminarTesis->hari}}" > --}}
                             </div>
 
                             <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="texr" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input-seminar" value="{{$seminarTesis->waktu}}">
+                                <div>
+                                    <div class="input-group date"  id="datetimepicker13" class="datetimepicker" data-target-input="nearest">
+                                        <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker13" name="waktu" id="haritgl"
+                                        @if($seminarTesis->waktu)
+                                            value="{{date("H:i:s", strtotime($seminarTesis->waktu))}}"
+                                        @endif
+                                        />
+                                        <div class="input-group-append" data-target="#datetimepicker13" data-toggle="datetimepicker">
+                                            <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                {{-- <input type="texr" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input-seminar" value="{{$seminarTesis->waktu}}"> --}}
                             </div>
 
                             <div class="form-group row col-md-12">
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 927cc7e..b0e5dfb 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans|Source+Sans+Pro" rel="stylesheet">
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.0-alpha14/css/tempusdominus-bootstrap-4.min.css" />
+    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
@@ -90,25 +90,83 @@
             window.history.back();
         }
     </script>
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/moment.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script> 
-    <script src="{{ asset('js/app.js') }}"></script>
-	<script>
-		$('.datetimepicker').datepicker({
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.0/moment.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.0-alpha14/js/tempusdominus-bootstrap-4.min.js"></script>
+	{{-- <script>
+        $('.datepicker').datepicker({
+            useCurrent: false,
             format: 'YYYY-MM-DD'
-		}); 
-	</script>
+        });
+	</script> --}}
     <script>
-		$('.datetimepicker').datetimepicker({
-            format: moment().format('YY-MM-D[T]HH-mm')
-		}); 
-	</script>
-	<script>
-		$('.timepicker').datetimepicker({
-			format: 'HH:mm'
-		}); 
-	</script>  
+        $('#datetimepicker1').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD HH:mm:SS'
+        });
+        $('#datetimepicker2').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD HH:mm:SS'
+        });
+        $('#datetimepicker3').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD HH:mm:SS'
+        });
+        $('#datetimepicker4').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD HH:mm:SS'
+        });
+        $('#datetimepicker5').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD HH:mm:SS'
+        });
+        $('#datetimepicker6').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD'
+        });
+        $('#datetimepicker7').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD'
+        });
+        $('#datetimepicker8').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD'
+        });
+        $('#datetimepicker9').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD'
+        });
+        $('#datetimepicker10').datetimepicker({
+            useCurrent: false,
+            format: 'YYYY-MM-DD'
+        });
+        $('#datetimepicker11').datetimepicker({
+            useCurrent: false,
+            format: 'HH:mm:SS'
+        });
+        $('#datetimepicker12').datetimepicker({
+            useCurrent: false,
+            format: 'HH:mm:SS'
+        });
+        $('#datetimepicker13').datetimepicker({
+            useCurrent: false,
+            format: 'HH:mm:SS'
+        });
+        $('#datetimepicker14').datetimepicker({
+            useCurrent: false,
+            format: 'HH:mm:SS'
+        });
+        $('#datetimepicker15').datetimepicker({
+            useCurrent: false,
+            format: 'HH:mm:SS'
+        });
+    </script>
+	{{-- <script>
+        $('.timepicker').timepicker({
+            format: 'HH:mm'
+        });
+	</script>   --}}
+    <script src="{{ asset('js/app.js') }}"></script>
     @yield('bottomjs')
 </body>
 </html>
diff --git a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
index 3e443c9..705ea0e 100644
--- a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
+++ b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
@@ -25,9 +25,22 @@
                     </div>
                     <div class="form-group row col-md-12">
                         <label for="tanggal_seminar_tesis" class="col-md-4 col-form-label text-md-right text-center">Waktu Seminar Tesis</label>
-                        <input type="text" id="tanggal_seminar_tesis" name="tanggal_seminar_tesis" class="form-control col-md-8 datetimepicker"
+                        <div>
+                            <div class="input-group date"  id="datetimepicker2" class="datetimepicker" data-target-input="nearest">
+                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker2" name="tanggal_seminar_tesis" id="tanggal_seminar_tesis"
+                                    @if($seminarTopik)
+                                        value="{{date("Y-m-d", strtotime($seminarTesis->hari))}} {{date("H:i:s", strtotime($seminarTesis->waktu))}}"
+                                    required disabled>
+                                    @endif
+                                    />
+                                    <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                </div>
+                            </div>
+                        </div>
+                        {{-- <input type="text" id="tanggal_seminar_tesis" name="tanggal_seminar_tesis" class="form-control col-md-8 datetimepicker"
                                value="{{date("Y-m-d", strtotime($seminarTesis->hari))}}T{{date("H:i", strtotime($seminarTesis->waktu))}}"
-                               required disabled>
+                               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>
diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index 679506a..70ef6e8 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -66,7 +66,20 @@
                     @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="text" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 datetimepicker" value="{{$tgl}}" required>
+                        <div>
+                            <div class="input-group date"  id="datetimepicker4" class="datetimepicker" data-target-input="nearest">
+                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker4" name="tanggal_waktu" id="tanggal_waktu"
+                                    @if($tgl)
+                                    value="{{date("Y-m-d H:i:s", strtotime($tgl))}}"
+                                    @endif
+                                    required
+                                    />
+                                    <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
+                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                </div>
+                            </div>
+                        </div>
+                        {{-- <input type="text" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 datetimepicker" 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>
@@ -78,7 +91,20 @@
                     </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="text" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 datetimepicker" value="{{$tgl_selanjutnya}}">
+                        <div>
+                            <div class="input-group date"  id="datetimepicker5" class="datetimepicker" data-target-input="nearest">
+                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker5" name="waktu_bimbingan_selanjutnya" id="waktu_bimbingan_selanjutnya"
+                                    @if($tgl_selanjutnya)
+                                    value="{{date("Y-m-d H:i:s", strtotime($tgl_selanjutnya))}}"
+                                    @endif
+                                    required
+                                    />
+                                    <div class="input-group-append" data-target="#datetimepicker5" data-toggle="datetimepicker">
+                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                </div>
+                            </div>
+                        </div>
+                        {{-- <input type="text" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 datetimepicker" value="{{$tgl_selanjutnya}}"> --}}
                     </div>
                 </div>
 
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 3407060..0039aba 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -165,12 +165,24 @@
                                                 <input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
                                                 <div class="row justify-content-center">
                                                     <div>
+                                                        <div class="input-group date"  id="datetimepicker1" class="datetimepicker" data-target-input="nearest">
+                                                            <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1" name="date"
+                                                            @if($seminarTopik)
+                                                                value="{{date("Y-m-d H:i:s", strtotime($seminarTopik->schedule))}}"
+                                                            @endif
+                                                            />
+                                                            <div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
+                                                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    {{-- <div>
                                                         <input type="text" class="form-control datetimepicker" name="date"
                                                                @if($seminarTopik)
                                                                value="{{date("Y-m-d\TH:i", strtotime($seminarTopik->schedule))}}"
                                                                 @endif
                                                         >
-                                                    </div>
+                                                    </div> --}}
                                                     <button class="btn btn-blue ml-4">
                                                         Tetapkan
                                                     </button>
@@ -487,11 +499,23 @@
                                                 <div class="form-group row mt-2">
                                                     <label for="name" class="col-md-4 col-form-label text-md-right">Jadwal Seminar Proposal</label>
                                                     <div class="col-md-6">
-                                                        <input type="text" class="form-control datetimepicker" name="date"
-                                                               @if($seminarProposal)
+                                                        <div>
+                                                            <div class="input-group date"  id="datetimepicker3" class="datetimepicker" data-target-input="nearest">
+                                                                <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker3" name="date"
+                                                                    @if($seminarProposal)
+                                                                        value="{{date("Y-m-d H:i:s", strtotime($seminarProposal->schedule))}}"
+                                                                    @endif
+                                                                    />
+                                                                    <div class="input-group-append" data-target="#datetimepicker3" data-toggle="datetimepicker">
+                                                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        {{-- <input type="text" class="form-control datetimepicker" name="date"
+                                                            @if($seminarProposal)
                                                                value="{{date("Y-m-d\TH:i", strtotime($seminarProposal->schedule))}}"
-                                                                @endif
-                                                        >
+                                                            @endif
+                                                        > --}}
                                                     </div>
                                                 </div>
                                                 <div class="form-group row mt-2">
@@ -774,14 +798,38 @@
                                                                     <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                                                         Tanggal
                                                                     </label>
-                                                                    <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input-seminar" value="{{$seminarTesis->hari}}" >
+                                                                    <div>
+                                                                        <div class="input-group date"  id="datetimepicker9" class="datetimepicker" data-target-input="nearest">
+                                                                            <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker9" name="haritgl" id="haritgl"
+                                                                            @if($seminarTesis->hari)
+                                                                                value="{{date("Y-m-d", strtotime($seminarTesis->hari))}}"
+                                                                            @endif
+                                                                            />
+                                                                            <div class="input-group-append" data-target="#datetimepicker9" data-toggle="datetimepicker">
+                                                                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                    {{-- <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input-seminar" value="{{$seminarTesis->hari}}" > --}}
                                                                 </div>
 
                                                                 <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="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input-seminar" value="{{$seminarTesis->waktu}}">
+                                                                    <div>
+                                                                        <div class="input-group date"  id="datetimepicker14" class="datetimepicker" data-target-input="nearest">
+                                                                            <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker14" name="waktu" id="haritgl"
+                                                                            @if($seminarTesis->waktu)
+                                                                                value="{{date("H:i:s", strtotime($seminarTesis->waktu))}}"
+                                                                            @endif
+                                                                            />
+                                                                            <div class="input-group-append" data-target="#datetimepicker14" data-toggle="datetimepicker">
+                                                                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                    {{-- <input type="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input-seminar" value="{{$seminarTesis->waktu}}"> --}}
                                                                 </div>
 
                                                                 <div class="form-group row col-md-12">
@@ -1570,14 +1618,38 @@
                                                             <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
                                                                 Tanggal
                                                             </label>
-                                                            <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input" value="{{$sidangTesis->tanggal}}" >
+                                                            <div>
+                                                                <div class="input-group date"  id="datetimepicker10" class="datetimepicker" data-target-input="nearest">
+                                                                    <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker10" name="haritgl" id="haritgl"
+                                                                    @if($sidangTesis->tanggal)
+                                                                        value="{{date("Y-m-d", strtotime($sidangTesis->tanggal))}}"
+                                                                    @endif
+                                                                    />
+                                                                    <div class="input-group-append" data-target="#datetimepicker10" data-toggle="datetimepicker">
+                                                                        <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            {{-- <input type="text" id="haritgl" name="haritgl" class="col-md-8 form-control datepicker new-input" value="{{$sidangTesis->tanggal}}" > --}}
                                                         </div>
 
                                                         <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="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input" value="{{$sidangTesis->jam}}">
+                                                            <div>
+                                                                <div class="input-group date"  id="datetimepicker15" class="datetimepicker" data-target-input="nearest">
+                                                                    <input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker15" name="waktu" id="haritgl"
+                                                                    @if($sidangTesis->jam)
+                                                                        value="{{date("H:i:s", strtotime($sidangTesis->jam))}}"
+                                                                    @endif
+                                                                    />
+                                                                    <div class="input-group-append" data-target="#datetimepicker15" data-toggle="datetimepicker">
+                                                                        <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            {{-- <input type="text" id="haritgl" name="waktu" class="col-md-8 form-control timepicker new-input" value="{{$sidangTesis->jam}}"> --}}
                                                         </div>
 
                                                         <div class="form-group row col-md-12">
-- 
GitLab