From 021dd724ebd04e60862baf6ca341e520d32abea3 Mon Sep 17 00:00:00 2001
From: "sylpheed.undine" <sylpheed.undine@gmail.com>
Date: Fri, 8 Feb 2019 13:40:16 +0700
Subject: [PATCH] datepicker proposal dsb. yang di mahasiswa
---
.../Controllers/SeminarTopikController.php | 3 +
.../mahasiswa/form_hasil_bimbingan.blade.php | 49 +++++++++-
.../detail_mahasiswa_control.blade.php | 98 +++++++++++--------
3 files changed, 105 insertions(+), 45 deletions(-)
diff --git a/app/Http/Controllers/SeminarTopikController.php b/app/Http/Controllers/SeminarTopikController.php
index 5486069..756026e 100644
--- a/app/Http/Controllers/SeminarTopikController.php
+++ b/app/Http/Controllers/SeminarTopikController.php
@@ -12,12 +12,15 @@ class SeminarTopikController extends Controller
$manajer= Auth::user()->isManajer();
$mhs_id = $request->get('mahasiswa');
$mahasiswa = Mahasiswa::find($mhs_id);
+ // Hotaru Debugging
+ //dd($request->get("date"));
if($manajer) {
if($mahasiswa) {
SeminarTopik::create(
[
"mahasiswa_id" => $mhs_id,
"schedule" => $request->get("date"),
+
"creator_id" => $manajer->id,
"topik_id" => $mahasiswa->getApprovedTopic()->id
]
diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index a7ba8d6..c348d48 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -39,12 +39,12 @@
<label for="dosen_id" class="col-md-4 col-form-label text-md-right text-center ">Dosen Pembimbing 1<sup>*</sup></label>
<select type="text" id="dosen_id" class="form-control col-md-8" name="dosen_id">
<option value="{{$tesis->dosen_pembimbing1}}">
- {{$tesis->dosen_pembimbing_1->user->name}}
+{{$tesis->dosen_pembimbing_1->user->name}}
</option>
@if($tesis->dosen_pembimbing2)
- <option value="{{$tesis->dosen_pembimbing2}}">
- {{$tesis->dosen_pembimbing_2->user->name}}
- </option>
+<option value="{{$tesis->dosen_pembimbing2}}">
+ {{$tesis->dosen_pembimbing_2->user->name}}
+</option>
@endif
</select>
</div>
@@ -58,7 +58,7 @@
</option>
@if($tesis->dosen_pembimbing2)
<option value="{{$tesis->dosen_pembimbing2}}">
- {{$tesis->dosen_pembimbing_2->user->name}}
+{{$tesis->dosen_pembimbing_2->user->name}}
</option>
@endif
</select>
@@ -66,7 +66,41 @@
@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>
+
+ <!-- original code -->
<input type="datetime-local" id="tanggal_waktu" name="tanggal_waktu" class="form-control col-md-8 " value="{{$tgl}}" required>
+
+ <!-- BUG 3 : Tanggal tidak bisa ditampilkan setelah di submit -->
+ <!-- Hotaru : DATETIME_PICKER -->
+ <!-- <div class="container"> -->
+ <!-- <div class="row">
+ <div class="col-sm-80">
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input type="text" class="form-control" data-target="#datetimepicker2"
+ id="tanggal_waktu" name="tanggal_waktu" value="{{$tgl}}" required
+ >
+ <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>
+
+ </div>
+ <script type="text/javascript">
+ $(function () {
+ // alert("hotaru : datetimepicker2");
+ $('#datetimepicker2').datetimepicker({
+ locale: 'ru',
+ use24hours: true,
+ format: 'YYYY/MM/DD HH:mm:ss'
+ });
+ });
+ </script>
+ </div> -->
+ <!-- </div> -->
+ <!-- END OF DATETIME_PICKER -->
+
</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 +112,12 @@
</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>
+
+ <!-- original code -->
<input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " 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 0aba9b2..d9d9821 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -178,29 +178,38 @@
<!-- BUG 1 : Tanggal tidak bisa ditampilkan setelah di submit -->
<!-- Hotaru : DATETIME_PICKER -->
-
- <div class="form-group">
- <div class="input-group date" id="datetimepicker1" name="date" data-target-input="nearest">
- <input type="text" class="form-control" data-target="#datetimepicker1"
-
- @if($datetimepicker)
- value="{{date("Y-m-d\TH:i:s", strtotime($datetimepicker))}}"
- @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 class="container">
+ <div class="row">
+ <div class="col-sm-35">
+
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
+ <input type="text" class="form-control" data-target="#datetimepicker1"
+ name=date
+ @if($seminarTopik)
+ value="{{date("Y-m-d\TH: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>
+ <script type="text/javascript">
+ $(function () {
+ // alert("hotaru : datetimepicker1");
+ $('#datetimepicker1').datetimepicker({
+ locale: 'ru',
+ use24hours: true,
+ format: 'YYYY/MM/DD HH:mm:ss'
+ });
+ });
+ </script>
+
</div>
</div>
-
- <script type="text/javascript">
- $(function () {
- $('#datetimepicker1').datetimepicker();
- });
- </script>
<!-- END OF DATETIME_PICKER -->
</div>
@@ -524,7 +533,7 @@
<div class="col-md-6">
- <!-- original date_picker -->
+ <!-- original code -->
<!-- <input type="datetime-local" class="form-control" name="date"
@if($seminarProposal)
value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
@@ -533,30 +542,39 @@
<!-- BUG 2 : Tanggal tidak bisa ditampilkan setelah di submit -->
<!-- Hotaru : DATETIME_PICKER -->
-
- <div class="form-group">
- <div class="input-group date" id="datetimepicker2" name="date" data-target-input="nearest">
- <input type="text" class="form-control" data-target="#datetimepicker2"
-
- @if($datetimepicker)
- value="{{date("Y-m-d\TH:i:s", strtotime($datetimepicker))}}"
- @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 class="container">
+ <div class="row">
+ <div class="col-sm-35">
+
+ <div class="form-group">
+ <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
+ <input type="text" class="form-control" data-target="#datetimepicker2"
+ name=date
+ @if($seminarProposal)
+ value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
+ @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>
</div>
+ <script type="text/javascript">
+ $(function () {
+ // alert("hotaru : datetimepicker2");
+ $('#datetimepicker2').datetimepicker({
+ locale: 'ru',
+ use24hours: true,
+ format: 'YYYY/MM/DD HH:mm:ss'
+ });
+ });
+ </script>
+
</div>
</div>
-
- <script type="text/javascript">
- $(function () {
- $('#datetimepicker2').datetimepicker();
- });
- </script>
- <!-- END OF DATETIME_PICKER -->
+ <!-- END OF DATETIME_PICKER -->
--
GitLab