diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d73821955b2fa786f1c746f52da6fd17f6a8ddec..82b95bcf7787a49cd8db54174d735869845b8e64 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -13,6 +13,12 @@ <!-- Styles --> <link href="{{ asset('css/app.css') }}" rel="stylesheet"> + <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> + <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script> + <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.1/js/tempusdominus-bootstrap-4.min.js"></script> + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.0.1/css/tempusdominus-bootstrap-4.min.css" /> + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> + <!-- <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous"> --> </head> <body> <div id="app"> diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php index 3db9c117ccf743e14ca02abc671be3363fe71edb..0aba9b2b5a95f99b4879ec3c78a275ae5fce7ac5 100644 --- a/resources/views/manajer/detail_mahasiswa_control.blade.php +++ b/resources/views/manajer/detail_mahasiswa_control.blade.php @@ -149,6 +149,9 @@ <h3> Penetapan Jadwal Seminar Topik </h3> + + + <div> @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK || $mahasiswa->status <= \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> @@ -165,15 +168,47 @@ <input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}"> <div class="row justify-content-center"> <div> - <input type="datetime-local" class="form-control" name="date" - @if($seminarTopik) - value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}" + + <!-- original code --> + <!-- <input type="datetime-local" class="form-control" name="date" + @if($seminarTopik) + value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}" + @endif + > --> + + <!-- 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> + </div> + </div> + + <script type="text/javascript"> + $(function () { + $('#datetimepicker1').datetimepicker(); + }); + </script> + <!-- END OF DATETIME_PICKER --> + </div> + <!-- button tetapkan --> <button class="btn btn-blue ml-4"> Tetapkan </button> + </div> </form> @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK) @@ -487,11 +522,44 @@ <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" - @if($seminarProposal) + + + <!-- original date_picker --> + <!-- <input type="datetime-local" class="form-control" name="date" + @if($seminarProposal) value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}" @endif - > + > --> + + <!-- 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> + </div> + </div> + + <script type="text/javascript"> + $(function () { + $('#datetimepicker2').datetimepicker(); + }); + </script> + <!-- END OF DATETIME_PICKER --> + + + </div> </div> <div class="form-group row mt-2">