diff --git a/app/Http/Controllers/HasilBimbinganController.php b/app/Http/Controllers/HasilBimbinganController.php
index 3b4bdae115e381c2bb9e4da57a188b4507608c32..2d81ecd5cd6fdaa8b84a475a30b3c51f2e0c6283 100644
--- a/app/Http/Controllers/HasilBimbinganController.php
+++ b/app/Http/Controllers/HasilBimbinganController.php
@@ -88,6 +88,16 @@ class HasilBimbinganController extends Controller
public function editHasilBimbingan(Request $request){
$mahasiswa = Auth::user()->isMahasiswa();
+
+ if(isset($_POST['tanggal_waktu'])) {
+ $tanggal_waktu = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+ }
+
+ if(isset($_POST['waktu_bimbingan_selanjutnya'])) {
+ $waktu_bimbingan_selanjutnya = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+ }
+
+
if($mahasiswa) {
$user = Auth::user();
$data = $request->all();
@@ -104,14 +114,16 @@ 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 = $data['tanggal_waktu'];
+ $cur->tanggal_waktu = $tanggal_waktu;
$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 = $data['waktu_bimbingan_selanjutnya'];
+ $cur->waktu_bimbingan_selanjutnya = $waktu_bimbingan_selanjutnya;
$cur->save();
}
}
@@ -135,6 +147,14 @@ class HasilBimbinganController extends Controller
$tesis = $mahasiswa->tesis();
$item_count = count($data);
+ if(isset($_POST['tanggal_waktu'])) {
+ $tanggal_waktu = date("Y-m-d\TH:i:s", strtotime($_POST['tanggal_waktu']));
+ }
+
+ if(isset($_POST['waktu_bimbingan_selanjutnya'])) {
+ $waktu_bimbingan_selanjutnya = date("Y-m-d\TH:i:s", strtotime($_POST['waktu_bimbingan_selanjutnya']));
+ }
+
$validator = $this->validateHasilBimbingan($data);
if ($validator->fails()) {
echo json_encode($validator->errors());
@@ -147,12 +167,14 @@ class HasilBimbinganController extends Controller
$hasil_bimbingan = HasilBimbingan::create([
'dosen_id' => $data['dosen_id'],
'status' => 0,
- 'tanggal_waktu' => $data['tanggal_waktu'],
+ // 'tanggal_waktu' => $data['tanggal_waktu'],
+ 'tanggal_waktu' => $tanggal_waktu,
'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' => $data['waktu_bimbingan_selanjutnya'],
+ 'waktu_bimbingan_selanjutnya' => $waktu_bimbingan_selanjutnya,
'thesis_id' => $tesis->id
]);
}
diff --git a/app/Http/Controllers/SeminarProposalController.php b/app/Http/Controllers/SeminarProposalController.php
index 4e4ee15c02bd83db2b61f312c94db3d1d1d13924..214985505f757b82bcbca4ac55e107589c65fe2c 100644
--- a/app/Http/Controllers/SeminarProposalController.php
+++ b/app/Http/Controllers/SeminarProposalController.php
@@ -14,12 +14,18 @@ class SeminarProposalController extends Controller
$manajer= Auth::user()->isManajer();
$mhs_id = $request->get('mahasiswa');
$mahasiswa = Mahasiswa::find($mhs_id);
+
+ if(isset($_POST['date'])){
+ $schedule = date("Y-m-d\TH:i:s", strtotime($_POST['date']));
+ }
+
if($manajer) {
if($mahasiswa) {
SeminarProposal::create(
[
"mahasiswa_id" => $mhs_id,
- "schedule" => $request->get("date"),
+ // "schedule" => $request->get("date"),
+ "schedule" => $schedule,
"creator_id" => $manajer->id,
"proposal_id" => $mahasiswa->proposal()->id,
"id_dosen_pembimbing_1" => $request->get('dosen_pembimbing_1'),
diff --git a/app/Http/Controllers/SeminarTesisController.php b/app/Http/Controllers/SeminarTesisController.php
index a2339fc6da746a656800079c452bfe5aae2cfec6..7360a64797d94e3ebcd22e39020a1b147c61b1a6 100644
--- a/app/Http/Controllers/SeminarTesisController.php
+++ b/app/Http/Controllers/SeminarTesisController.php
@@ -36,6 +36,12 @@ class SeminarTesisController extends Controller
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
+
+ if(isset($_POST['haritgl'])) {
+ $haritgl_hari = date("Y-m-d", strtotime($_POST['haritgl']));
+ $haritgl_waktu = date("H:i:s", strtotime($_POST['haritgl']));
+ }
+
if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
@@ -45,14 +51,16 @@ 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 = $request->get('haritgl');
+ // $waktu = $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' => $hari,
+ // 'waktu'=> $waktu,
+ 'hari' => $haritgl_hari,
+ 'waktu'=> $haritgl_waktu,
'tempat' => $tempat,
'approval_pembimbing1' => $db1,
'approval_pembimbing2' => $db2,
@@ -73,6 +81,12 @@ class SeminarTesisController extends Controller
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
+
+ if(isset($_POST['haritgl'])) {
+ $haritgl_hari = date("Y-m-d", strtotime($_POST['haritgl']));
+ $haritgl_waktu = date("H:i:s", strtotime($_POST['haritgl']));
+ }
+
if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
@@ -87,8 +101,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 = $request->get('waktu');
+ // $st->hari = $request->get('haritgl');
+ $st->waktu = $haritgl_waktu;
+ $st->hari = $haritgl_hari;
$st->tempat = $request->get('tempat');
$judul = $request->get('judul');
$tesis->judul_thesis = $judul;
diff --git a/app/Http/Controllers/SeminarTopikController.php b/app/Http/Controllers/SeminarTopikController.php
index 54860692e101c72eae5915383d147bd9d0774484..f0dcb550e7fee973902233ca4fbcd4adccba647b 100644
--- a/app/Http/Controllers/SeminarTopikController.php
+++ b/app/Http/Controllers/SeminarTopikController.php
@@ -12,12 +12,18 @@ class SeminarTopikController extends Controller
$manajer= Auth::user()->isManajer();
$mhs_id = $request->get('mahasiswa');
$mahasiswa = Mahasiswa::find($mhs_id);
+
+ if(isset($_POST['date'])){
+ $schedule = date("Y-m-d\TH:i:s", strtotime($_POST['date']));
+ }
+
if($manajer) {
if($mahasiswa) {
SeminarTopik::create(
[
"mahasiswa_id" => $mhs_id,
- "schedule" => $request->get("date"),
+ // "schedule" => $request->get("date"),
+ "schedule" => $schedule,
"creator_id" => $manajer->id,
"topik_id" => $mahasiswa->getApprovedTopic()->id
]
diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index 1f6947076d5931a84ebc99f05d4e0394eb65cb14..5f3c8f1a827029b92ab9d5390b168a6360ef4f19 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -482,10 +482,18 @@ class SidangTesisController extends Controller
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
$sidang = $tesis->sidangTesis();
+
+ if(isset($_POST['haritgl'])){
+ $tanggal = date("Y-m-d", strtotime($_POST['haritgl']));
+ $jam = 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 = $request->get('haritgl');
+ // $sidang->jam = $request->get('waktu');
+ $sidang->tanggal = $tanggal;
+ $sidang->jam = $jam;
$sidang->tempat = $request->get('tempat');
$tesis->judul_thesis = $request->get('judul');
$sidang->ajuan_penguji1 = $request->get('usulan_penguji1');
@@ -503,6 +511,11 @@ 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'])){
+ $jadwal_seminar = 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,7 +560,8 @@ class SidangTesisController extends Controller
$sidang->semester_terdaftar = $request->get('semester_daftar');
- $sidang->jadwal_seminar = $request->get('tanggal_seminar_tesis');
+ // $sidang->jadwal_seminar = $request->get('tanggal_seminar_tesis');
+ $sidang->jadwal_seminar = $jadwal_seminar;
$sidang->save();
return view('mahasiswa.daftar_sidang_tesis',['success'=>true]);
@@ -626,10 +640,18 @@ class SidangTesisController extends Controller
$mhs = $usr->isMahasiswa();
$tesis = $mhs->tesis();
$sidang = $tesis->sidangTesis();
+
+ if(isset($_POST['haritgl'])){
+ $tanggal = date("Y-m-d", strtotime($_POST['haritgl']));
+ $jam = 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 = $request->get('haritgl');
+ // $sidang->jam = $request->get('waktu');
+ $sidang->tanggal = $tanggal;
+ $sidang->jam = $jam;
$sidang->tempat = $request->get('tempat');
$sidang->dosen_penguji_1 = $request->get('dosen_penguji1');
$sidang->dosen_penguji_2 = $request->get('dosen_penguji2');
diff --git a/doc/changerequest.md b/doc/changerequest.md
index f1e4ab191aefdf732cd5566862ed1cea50a23f28..b7fd4e00aad2eb4e9c7166cc0311f4d96fa71f8a 100644
--- a/doc/changerequest.md
+++ b/doc/changerequest.md
@@ -37,6 +37,11 @@
3. Membuat _handler_ untuk pembuatan akun mahasiswa tanpa pembuatan kelas tesis
4. Membuat _handler_ untuk pembuatan akun dengan alamat _e-mail_ yang sama
5. _Fix bug_:Membuat pada tampilan _dashboard_ dosen dengan css
+6. Membuat komponen `datetimepicker` untuk input tanggal
+7. Implementasi komponen `datetimepicker` di _dashboard_ dosen
+8. Implementasi komponen `datetimepicker` di _dashboard_ mahasiswa
+9. Implementasi komponen `datetimepicker` di _dashboard_ manajer
+
#### Dokumentasi Teknis 1
Struktur PL
@@ -99,15 +104,21 @@ Antarmuka PL
After:
+- Input tanggal sekarang menggunakan `datetimepicker`
+
+ 
+
### Sprint 2
#### Product Backlog 2
1. _Fix bug_: membuat _handler_ pada registrasi dengan isi _password_ dengan _confirm password_ berbeda
+2. _Fix bug_: `datetimepicker` doesn't affect changes in input
#### Sprint Backlog 2
1. Membuat _handler_ untuk registrasi dengan isi _password_ dengan _confirm password_ berbeda
+2. Menyesuaikan _back end_ untuk menerima input tanggal dan waktu dari _field_ yang sama
#### Dokumentasi Teknis 2
@@ -121,6 +132,12 @@ Perilaku PL
After: registrasi akun dengan isi _password_ dengan _confirm password_ berbeda akan gagal dan muncul notifikasi bahwa isi _confirm password_ berbeda.
+- Menyesuaikan _back end_ untuk menerima input tanggal dan waktu dari _field_ yang sama
+
+ Before: Apabila ada input dari _field_ tanggal/waktu, aplikasi memiliki 2 kemungkinan output: rusak atau input dari date picker tidak dianggap
+
+ After: Aplikasi dapat menerima tanggal dan waktu dari _field_ yang sama
+
Antarmuka PL
- Membuat _handler_ untuk registrasi dengan isi _password_ dengan _confirm password_ berbeda
diff --git a/doc/screenshots/datepicker_manajer.png b/doc/screenshots/datepicker_manajer.png
new file mode 100644
index 0000000000000000000000000000000000000000..53baeed45c82dcbed38fadba592d331aacc448d5
Binary files /dev/null and b/doc/screenshots/datepicker_manajer.png differ
diff --git a/resources/views/dosen/create_seminartesis.blade.php b/resources/views/dosen/create_seminartesis.blade.php
index 5e0e8244b8694b23d83d580b04dfe16b3274f3a5..b76faba6fc9cdca6cd1c472f7f6a68f4be421338 100644
--- a/resources/views/dosen/create_seminartesis.blade.php
+++ b/resources/views/dosen/create_seminartesis.blade.php
@@ -29,17 +29,28 @@
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
+ Jadwal
</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> -->
<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/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index ad3adb1de856ef606a408c523222ee3c001a9fa9..492ee59451775268d64d3dceea21a18f6839a1a0 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -202,21 +202,30 @@
<input type="text" id="judul" name="judul" class="col-md-8 form-control new-input" value="{{$mahasiswa->tesis()->judul_thesis}}">
</div>
-
-
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
+ Jadwal
</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">
@@ -362,17 +371,28 @@
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
+ Jadwal
</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}}">
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index d499bb78d7841d3205765d03b5bf1d38d7e99649..f16afc61453d46a922fbcdffc729bdffd54ce10a 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -10,7 +10,20 @@
function Button_Click() {
document.getElementById('buttondetail').value = statejs;
statejs = 1;
-}
+ }
+
+ // datetimepicker scripts
+ $(function () {
+ $('#date').datetimepicker({
+ format: 'L'
+ });
+ });
+
+ $(function () {
+ $('#datetime').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/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d73821955b2fa786f1c746f52da6fd17f6a8ddec..d16feaad0bdf06d834cd0dcb237871dffd18e0f3 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -11,6 +11,16 @@
<title>{{ config('app.name') }} - @yield('title')</title>
+ <!-- Sorry for the mess, datepicker bullshits -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment-with-locales.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
+ <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet"/>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
+ <script src="https://rawgit.com/tempusdominus/bootstrap-4/master/build/js/tempusdominus-bootstrap-4.js"></script>
+ <link href="https://rawgit.com/tempusdominus/bootstrap-4/master/build/css/tempusdominus-bootstrap-4.css" rel="stylesheet"/>
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"/>
+
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>
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 3db9c117ccf743e14ca02abc671be3363fe71edb..ca05bba28a4499f6705a4ec3749b460f6ed3ca1a 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -165,11 +165,24 @@
<input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
<div class="row justify-content-center">
<div>
- <input type="datetime-local" class="form-control" name="date"
+ <!-- <input type="datetime-local" class="form-control" name="date"
@if($seminarTopik)
value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
@endif
- >
+ > -->
+ <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"
+ />
+ <span class="input-group-addon" data-target="#datetimepicker1" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<button class="btn btn-blue ml-4">
Tetapkan
@@ -487,11 +500,24 @@
<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="datetime-local" class="form-control" name="date"
+ <!-- <input type="datetime-local" class="form-control" name="date"
@if($seminarProposal)
value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
@endif
- >
+ > -->
+ <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"
+ />
+ <span class="input-group-addon" data-target="#datetimepicker2" data-toggle="datetimepicker">
+ <span class="fa fa-calendar"></span>
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<div class="form-group row mt-2">
@@ -772,17 +798,28 @@
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
+ Jadwal
</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="datetimepicker3" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input-seminar" data-target="#datetimepicker3"
+ value="{{date("m/d/Y", strtotime($seminarTesis->hari))}} {{date("g:i A", strtotime($seminarTesis->waktu))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker3" 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}}">
@@ -1568,17 +1605,28 @@
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
+ Jadwal
</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="datetimepicker4" data-target-input="nearest">
+ <input name="haritgl" id="haritgl" type="text" class="form-control datetimepicker-input new-input" data-target="#datetimepicker4"
+ value="{{date("m/d/Y", strtotime($sidangTesis->tanggal))}} {{date("g:i A", strtotime($sidangTesis->jam))}}" />
+ <span class="input-group-addon" data-target="#datetimepicker4" 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">