diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 061ab56df35aeb8509e56b3cd5e01a68976928c2..6c5197d3c4fdcb29021f99e4e9fd0a6e620af221 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -166,53 +166,39 @@
<input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
<div class="row justify-content-center">
<div>
+ @if($mahasiswa->status == 2 || $mahasiswa->status ==-4)
<div style="overflow:hidden;" id="datee">
<div class="form-group">
<div class="row">
<div class="col-md-10">
- <div id="datetimepicker12" name="halo"></div>
+ <div id="datetimepickercomponent"></div>
</div>
</div>
- </div>
- <script type="text/javascript">
- $(function () {
- $('#datetimepicker12').datetimepicker({
- inline: true,
- sideBySide: true,
- icons: {
- time: 'fa fa-clock-o',
- date: 'fa fa-calendar',
- up: 'fa fa-chevron-up',
- down: 'fa fa-chevron-down',
- next: 'fa fa-chevron-right',
- previous: 'fa fa-chevron-left'},
- });
- console.log($('#datetimepicker12').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'));
- });
- </script>
+ </div>
</div>
-
-
- <input type="text" class="form-control" name="date" id="hiddentopikjadwal"
- @if($seminarTopik)
- value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
- @endif
- >
+
<script>
$('#seminartopik-form').submit(function(){
- $('#hiddentopikjadwal').val($('#datetimepicker12').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'))
- })
- $('#datetimepicker12').on('change dp.change', function(){
- $('#hiddentopikjadwal').val($('#datetimepicker12').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'))
+ $('#hiddentopikjadwal').val($('#datetimepickercomponent').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'))
})
</script>
+ @endif
+
+ @if ($mahasiswa->status == 3)
+ <input type="text" class="form-control" name="date" id="hiddentopikjadwal"
+ value="{{date("Y-m-d H:i:s", strtotime($seminarTopik->schedule))}}"
+ >
+ @else
+ <input type="hidden" class="form-control" name ="date" id="hiddentopikjadwal">
+ <div class="row justify-content-center">
+ <button class="btn btn-blue ml-4">
+ Tetapkan
+ </button>
+ </div>
+ @endif
</div>
</div>
- <div class="row justify-content-center">
- <button class="btn btn-blue ml-4">
- Tetapkan
- </button>
- </div>
+
</form>
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK)
</fieldset>
@@ -519,17 +505,33 @@
<fieldset disabled="disabled">
@endif
<div class="row col-md-12 flex-wrap-nowrap justify-content-center">
- <form action="{{route('seminarproposal-penetapan')}}" method="post" class="col-md-12">
+ <form action="{{route('seminarproposal-penetapan')}}" method="post" class="col-md-12" id="seminarproposal-form">
{{csrf_field()}}
<input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
<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)
- value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
- @endif
- >
+ <label for="name" class="text-md-right">Jadwal Seminar Proposal</label>
+ </div>
+ <div class="row mt-2">
+ <div class="col-md-auto">
+ @if($mahasiswa->status == 7 || $mahasiswa->status ==-9)
+ <div style="overflow:hidden;">
+ <div class="form-group">
+ <div class="row">
+ <div class="col-md-10">
+ <div id="datetimepickercomponent"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ $('#seminarproposal-form').submit(function(){
+ $('#hiddenseminarjadwal').val($('#datetimepickercomponent').data("DateTimePicker").viewDate().format('YYYY-MM-DD HH:mm:ss'))
+ })
+ </script>
+ @endif
+
+
</div>
</div>
<div class="form-group row mt-2">
@@ -624,9 +626,18 @@
</div>
<div class="row justify-content-center">
- <button class="btn btn-blue ml-4">
- Tetapkan
- </button>
+ @if ($mahasiswa->status == 8)
+ <input type="text" class="form-control" name="date" id="hiddenseminarjadwal"
+ value="{{date("Y-m-d H:i:s", strtotime($seminarProposal->schedule))}}"
+ >
+ @else
+ <input type="hidden" class="form-control" name ="date" id="hiddenseminarjadwal">
+ <div class="row justify-content-center">
+ <button class="btn btn-blue ml-4">
+ Tetapkan
+ </button>
+ </div>
+ @endif
</div>
</form>
</div>
@@ -1783,6 +1794,29 @@
@endsection
@section('bottomjs')
+ <!-- Scripts from detail_control -->
+
+ <!-- Preparing datetimepicker -->
+ <script type="text/javascript">
+ $(function () {
+ if ($('#datetimepickercomponent').length){
+ $('#datetimepickercomponent').datetimepicker({
+ inline: true,
+ sideBySide: true,
+ icons: {
+ time: 'fa fa-clock-o',
+ date: 'fa fa-calendar',
+ up: 'fa fa-chevron-up',
+ down: 'fa fa-chevron-down',
+ next: 'fa fa-chevron-right',
+ previous: 'fa fa-chevron-left'},
+ });
+ }
+ });
+ </script>
+
+
+
<script>
var penilaian = new Vue({
el: "#penilaian-seminar-proposal",