From 0b0aa4ad00f0ef9ae50aa86119048871d1f1dc4b Mon Sep 17 00:00:00 2001 From: Roland Hartanto <rolandhartanto@gmail.com> Date: Fri, 11 May 2018 10:12:55 +0700 Subject: [PATCH] deploy (fix drop down menu) --- .../Controllers/SidangTesisController.php | 8 +++ .../views/dosen/detail_mahasiswa.blade.php | 6 +- .../detail_mahasiswa_control.blade.php | 59 ++++++++++++++----- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php index 3908560..1f69470 100644 --- a/app/Http/Controllers/SidangTesisController.php +++ b/app/Http/Controllers/SidangTesisController.php @@ -267,6 +267,8 @@ class SidangTesisController extends Controller $sidangtesis->nilai_dosen_penguji_1_penting = NULL; $sidangtesis->nilai_dosen_penguji_1_pendukung = NULL; $sidangtesis->nilai = NULL; + $mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS; + $mhs->save(); $sidangtesis->save(); return back(); } @@ -292,6 +294,8 @@ class SidangTesisController extends Controller $sidangtesis->nilai_dosen_penguji_2_penting = NULL; $sidangtesis->nilai_dosen_penguji_2_pendukung = NULL; $sidangtesis->nilai = NULL; + $mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS; + $mhs->save(); $sidangtesis->save(); return back(); } @@ -317,6 +321,8 @@ class SidangTesisController extends Controller $sidangtesis->nilai_dosen_pembimbing_penting = NULL; $sidangtesis->nilai_dosen_pembimbing_pendukung = NULL; $sidangtesis->nilai = NULL; + $mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS; + $mhs->save(); $sidangtesis->save(); return back(); } @@ -340,7 +346,9 @@ class SidangTesisController extends Controller else { $sidangtesis->nilai_dosen_kelas_utama = NULL; $sidangtesis->nilai = NULL; + $mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS; $sidangtesis->save(); + $mhs->save(); return back(); } } diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php index 86ab23e..1c12ff1 100644 --- a/resources/views/dosen/detail_mahasiswa.blade.php +++ b/resources/views/dosen/detail_mahasiswa.blade.php @@ -232,6 +232,7 @@ <select name="usulan_penguji1" class="form-control col-md-8" id=""> <option></option> @foreach(App\Dosen::getListDosenPenguji() as $item) + @if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2) <option value="{{$item->id}}" @if($sidangTesis->ajuan_penguji1 == $item->id) selected @@ -240,6 +241,7 @@ {{$item->user->name}} </option> + @endif @endforeach </select> </div> @@ -250,7 +252,8 @@ </label> <select name="usulan_penguji2" class="form-control col-md-8" id=""> <option></option> - @foreach(App\Dosen::getListDosenPenguji() as $item) + @foreach(App\Dosen::getListDosenPenguji() as $item)\ + @if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2) <option value="{{$item->id}}" @if($sidangTesis->ajuan_penguji2 == $item->id) selected @@ -258,6 +261,7 @@ > {{$item->user->name}} </option> + @endif @endforeach </select> </div> diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php index 70d9f3f..75e2b4e 100644 --- a/resources/views/manajer/detail_mahasiswa_control.blade.php +++ b/resources/views/manajer/detail_mahasiswa_control.blade.php @@ -480,10 +480,16 @@ <div class="col-md-6"> <select name="dosen_pembimbing_1" class="form-control" id="" required> @if($seminarProposal) - <option value="{{$seminarProposal->id_dosen_pembimbing_1}}" selected> - {{$seminarProposal->dosen_pembimbing_1->user->name}} - </option> - @else + @if($seminarProposal->dosen_pembimbing_1) + @foreach(\App\Dosen::getListDosenPembimbing1() as $item) + @php($user_item = $item->user) + <option value="{{$user_item->id}}" + @if($seminarProposal->id_dosen_pembimbing_1 == $item->id) + selected + @endif + >{{$user_item->name}}</option> + @endforeach + @else @foreach(\App\Dosen::getListDosenPembimbing1() as $item) @php($user_item = $item->user) <option value="{{$user_item->id}}" @@ -492,6 +498,7 @@ @endif >{{$user_item->name}}</option> @endforeach + @endif @endif </select> </div> @@ -501,21 +508,30 @@ <div class="col-md-6"> <select name="dosen_pembimbing_2" class="form-control" id=""> @if($seminarProposal) - @if($seminarProposal->dosen_pembimbing_2) - <option value="{{$seminarProposal->id_dosen_pembimbing_2}}" selected> - {{$seminarProposal->dosen_pembimbing_2->user->name}} + @if($seminarProposal->dosen_pembimbing_2) + <option value=""> </option> - @endif - @else + @foreach(\App\Dosen::getListDosenPembimbing2() as $item) + @php($user_item = $item->user) + <option value="{{$user_item->id}}" + @if($seminarProposal->id_dosen_pembimbing_2 == $item->id) + selected + @endif + >{{$user_item->name}}</option> + @endforeach + @else <option value=""> - </option> @foreach(\App\Dosen::getListDosenPembimbing2() as $item) @php($user_item = $item->user) <option value="{{$user_item->id}}" + @if($topik->calon_pembimbing2 == $item->id) + selected + @endif >{{$user_item->name}}</option> @endforeach @endif + @endif </select> </div> </div> @@ -526,16 +542,23 @@ <div class="col-md-6"> <select name="dosen_penguji" class="form-control" id=""> @if($seminarProposal) - <option value="{{$seminarProposal->id_dosen_penguji}}" selected> - {{$seminarProposal->dosen_penguji->user->name}} - </option> - @else + @if($seminarProposal->dosen_penguji) + @foreach(\App\Dosen::getListDosenPenguji() as $item) + @php($user_item = $item->user) + <option value="{{$user_item->id}}" + @if($seminarProposal->id_dosen_penguji == $item->id) + selected + @endif + >{{$user_item->name}}</option> + @endforeach + @else @foreach(\App\Dosen::getListDosenPenguji() as $item) @php($user_item = $item->user) <option value="{{$user_item->id}}" >{{$user_item->name}}</option> @endforeach @endif + @endif </select> </div> </div> @@ -1519,10 +1542,11 @@ </div> <div class="form-group row col-md-12"> <label for="tempat" class="col-md-4 col-form-label text-md-right text-center"> - Usulan Dosen Penguji + Dosen Penguji 1 </label> <select name="dosen_penguji1" class="form-control col-md-8" id=""> @foreach(App\Dosen::getListDosenPenguji() as $item) + @if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2) <option value="{{$item->id}}" @if($sidangTesis->dosen_penguji_1 == $item->id) selected @@ -1532,16 +1556,18 @@ {{$item->user->name}} </option> + @endif @endforeach </select> </div> <div class="form-group row col-md-12"> <label for="tempat" class="col-md-4 col-form-label text-md-right text-center"> - Usulan Dosen Penguji + Dosen Penguji 2 </label> <select name="dosen_penguji2" class="form-control col-md-8" id=""> @foreach(App\Dosen::getListDosenPenguji() as $item) + @if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2) <option value="{{$item->id}}" @if($sidangTesis->dosen_penguji_2 == $item->id) selected @@ -1550,6 +1576,7 @@ {{$item->user->name}} </option> + @endif @endforeach </select> </div> -- GitLab