diff --git a/app/Dosen.php b/app/Dosen.php index b1328f8fd61a1c5cf34254354c7a96f0fab51585..f6b579ea5897c46beda002c2229db604e91c67a3 100644 --- a/app/Dosen.php +++ b/app/Dosen.php @@ -3,6 +3,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Auth; class Dosen extends Model { @@ -21,6 +22,10 @@ class Dosen extends Model return $this->belongsTo('\App\User','id','id'); } + public function user1() { + return User::find($this->id); + } + public function getHasilBimbinganBelumDisetujui(){ $hsl_bimbingan = HasilBimbingan::where('dosen_id',$this->id)->where('status',0)->get(); return $hsl_bimbingan; @@ -47,4 +52,8 @@ class Dosen extends Model public function sidangTesisNeedApproval() { return SidangTesis::where('ajuan_penguji1', $this->id)->orWhere('ajuan_penguji2',$this->id)->orWhere('ajuan_penguji3',$this->id)->get(); } + + public function sidangTesisApproved() { + return SidangTesis::where('dosen_penguji_1', $this->id)->orWhere('dosen_penguji_2',$this->id)->get(); + } } diff --git a/app/Http/Controllers/DosenController.php b/app/Http/Controllers/DosenController.php index 2865e9a517913d9a3a75a83cd23c88188b1d3056..de3bfb9f1c8a6e3e5c662794b2acc285275f1a10 100644 --- a/app/Http/Controllers/DosenController.php +++ b/app/Http/Controllers/DosenController.php @@ -7,6 +7,7 @@ use App\User; use App\Dosen; use App\Thesis; use App\SeminarTesis; +use App\KelasTesis; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -31,8 +32,10 @@ class DosenController extends Controller $iddosen = Auth::user()->id; $idmahasiswabimbingan = Thesis::where('dosen_pembimbing1', $iddosen)->orWhere('dosen_pembimbing2', $iddosen)->pluck('mahasiswa_id'); $mahasiswabimbingan = Mahasiswa::whereIn('id',$idmahasiswabimbingan)->get(); + $mahasiswakelas = Mahasiswa::where('status','>=',14)->get(); + $kelas = KelasTesis::orderByRaw('updated_at - created_at DESC')->first(); - return view('dosen.index', ['mahasiswabimbingan' => $mahasiswabimbingan]); + return view('dosen.index', ['mahasiswabimbingan' => $mahasiswabimbingan, 'mahasiswakelas' => $mahasiswakelas, 'kelas' =>$kelas]); } else { return abort(403); } diff --git a/app/Http/Controllers/SeminarTesisController.php b/app/Http/Controllers/SeminarTesisController.php index 5877ced0909e87cd038ab64b797cb9ff8280a9f7..8f2f080d56031a9c1f056678c0ae84243eb77ea5 100644 --- a/app/Http/Controllers/SeminarTesisController.php +++ b/app/Http/Controllers/SeminarTesisController.php @@ -92,7 +92,7 @@ class SeminarTesisController extends Controller $seminarteman = $request->get('check-seminar-dengan-teman'); $st->draft_laporan = isset($draft); - $st->seminar_dengan_teman = isset($seminarteman); + $st->sidang_dengan_teman = isset($seminarteman); $st->save(); } if($db1 || $db2) { diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php index 4be6b15a98121ad914a9a1598c658b7ef93bc315..840190dba5634e94abb04ccafe8de19e39616b84 100644 --- a/app/Http/Controllers/SidangTesisController.php +++ b/app/Http/Controllers/SidangTesisController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\KelasTesis; use App\SidangTesis; use App\Thesis; use Illuminate\Http\Request; @@ -42,6 +43,7 @@ class SidangTesisController extends Controller if(!$tesis) return abort(400); $sidangtesis = $tesis->sidangTesis(); + $kelas = KelasTesis::orderByRaw('updated_at - created_at DESC')->first(); if(!$sidangtesis) return abort(400); else { @@ -55,9 +57,11 @@ class SidangTesisController extends Controller $cek_nilai_penguji_1 = !is_null($sidangtesis->nilai_dosen_penguji_1_utama) && !is_null($sidangtesis->nilai_dosen_penguji_1_penting) && !is_null($sidangtesis->nilai_dosen_penguji_1_pendukung); $cek_nilai_penguji_2 = !is_null($sidangtesis->nilai_dosen_penguji_2_utama) && !is_null($sidangtesis->nilai_dosen_penguji_2_penting) && !is_null($sidangtesis->nilai_dosen_penguji_2_pendukung); $cek_nilai_pembimbing = !is_null($sidangtesis->nilai_dosen_pembimbing_utama) && !is_null($sidangtesis->nilai_dosen_pembimbing_penting) && !is_null($sidangtesis->nilai_dosen_pembimbing_pendukung); - $cek_nilai_kelas = !is_null($sidangtesis->nilai_dosen_kelas_utama) && !is_null($sidangtesis->nilai_dosen_kelas_penting); + $cek_nilai_kelas = !is_null($sidangtesis->nilai_dosen_kelas_utama); $all_score_filled = $cek_nilai_pembimbing && $cek_nilai_penguji_1 && $cek_nilai_penguji_2 && $cek_nilai_kelas; + error_log('tes masuk'); if ($all_score_filled) { + error_log('tes masuk 2'); $ratautama = $this->countRata2($sidangtesis->nilai_dosen_penguji_1_utama, $sidangtesis->nilai_dosen_penguji_2_utama, $sidangtesis->nilai_dosen_pembimbing_utama, $sidangtesis->nilai_dosen_kelas_utama); $ratapenting = $this->countRata2($sidangtesis->nilai_dosen_penguji_1_penting, $sidangtesis->nilai_dosen_penguji_2_penting, $sidangtesis->nilai_dosen_pembimbing_penting, $sidangtesis->nilai_dosen_kelas_penting); $ratapendukung = $this->countRata($sidangtesis->nilai_dosen_penguji_1_pendukung, $sidangtesis->nilai_dosen_penguji_2_pendukung, $sidangtesis->nilai_dosen_pembimbing_pendukung); @@ -101,7 +105,7 @@ class SidangTesisController extends Controller $cek_nilai_penguji_1 = !is_null($sidangtesis->nilai_dosen_penguji_1_utama) && !is_null($sidangtesis->nilai_dosen_penguji_1_penting) && !is_null($sidangtesis->nilai_dosen_penguji_1_pendukung); $cek_nilai_penguji_2 = !is_null($sidangtesis->nilai_dosen_penguji_2_utama) && !is_null($sidangtesis->nilai_dosen_penguji_2_penting) && !is_null($sidangtesis->nilai_dosen_penguji_2_pendukung); $cek_nilai_pembimbing = !is_null($sidangtesis->nilai_dosen_pembimbing_utama) && !is_null($sidangtesis->nilai_dosen_pembimbing_penting) && !is_null($sidangtesis->nilai_dosen_pembimbing_pendukung); - $cek_nilai_kelas = !is_null($sidangtesis->nilai_dosen_kelas_utama) && !is_null($sidangtesis->nilai_dosen_kelas_penting); + $cek_nilai_kelas = !is_null($sidangtesis->nilai_dosen_kelas_utama); $all_score_filled = $cek_nilai_pembimbing && $cek_nilai_penguji_1 && $cek_nilai_penguji_2 && $cek_nilai_kelas; if ($all_score_filled) { $ratautama = $this->countRata2($sidangtesis->nilai_dosen_penguji_1_utama, $sidangtesis->nilai_dosen_penguji_2_utama, $sidangtesis->nilai_dosen_pembimbing_utama, $sidangtesis->nilai_dosen_kelas_utama); @@ -155,22 +159,22 @@ class SidangTesisController extends Controller $ratapendukung = $this->countRata($sidangtesis->nilai_dosen_penguji_1_pendukung, $sidangtesis->nilai_dosen_penguji_2_pendukung, $sidangtesis->nilai_dosen_pembimbing_pendukung); if ($ratautama == "L") { if ($ratapenting == "L") { - if (($ratapendukung == "L") || ($ratapendukung=="M")) { + if (($ratapendukung == "L") || ($ratapendukung == "M")) { $sidangtesis->nilai = "A"; } else { $sidangtesis->nilai = "AB"; } } else { - $sidangtesis->nilai = "AB"; + $sidangtesis->nilai = "AB"; } } else { if ($ratautama == "M") { - if (($ratapenting == "L") || ($ratapenting=="M")) { - if (($ratapendukung == "L") || ($ratapendukung=="M")) { + if (($ratapenting == "L") || ($ratapenting == "M")) { + if (($ratapendukung == "L") || ($ratapendukung == "M")) { $sidangtesis->nilai = "B"; } } else { - if (($ratapendukung == "L") || ($ratapendukung=="M")) { + if (($ratapendukung == "L") || ($ratapendukung == "M")) { $sidangtesis->nilai = "BC"; } else { $sidangtesis->nilai = "C"; @@ -183,6 +187,50 @@ class SidangTesisController extends Controller } $sidangtesis->save(); return back(); + }else if($kelas->id_dosen_kelas == $currentUser->id) { + $scoreutama = $request->get('scoreUtama'); + + $sidangtesis->nilai_dosen_kelas_utama = $scoreutama; + + $cek_nilai_penguji_1 = !is_null($sidangtesis->nilai_dosen_penguji_1_utama) && !is_null($sidangtesis->nilai_dosen_penguji_1_penting) && !is_null($sidangtesis->nilai_dosen_penguji_1_pendukung); + $cek_nilai_penguji_2 = !is_null($sidangtesis->nilai_dosen_penguji_2_utama) && !is_null($sidangtesis->nilai_dosen_penguji_2_penting) && !is_null($sidangtesis->nilai_dosen_penguji_2_pendukung); + $cek_nilai_pembimbing = !is_null($sidangtesis->nilai_dosen_pembimbing_utama) && !is_null($sidangtesis->nilai_dosen_pembimbing_penting) && !is_null($sidangtesis->nilai_dosen_pembimbing_pendukung); + $cek_nilai_kelas = !is_null($sidangtesis->nilai_dosen_kelas_utama); + $all_score_filled = $cek_nilai_pembimbing && $cek_nilai_penguji_1 && $cek_nilai_penguji_2 && $cek_nilai_kelas; + if ($all_score_filled) { + $ratautama = $this->countRata2($sidangtesis->nilai_dosen_penguji_1_utama, $sidangtesis->nilai_dosen_penguji_2_utama, $sidangtesis->nilai_dosen_pembimbing_utama, $sidangtesis->nilai_dosen_kelas_utama); + $ratapenting = $this->countRata($sidangtesis->nilai_dosen_penguji_1_penting, $sidangtesis->nilai_dosen_penguji_2_penting, $sidangtesis->nilai_dosen_pembimbing_penting); + $ratapendukung = $this->countRata($sidangtesis->nilai_dosen_penguji_1_pendukung, $sidangtesis->nilai_dosen_penguji_2_pendukung, $sidangtesis->nilai_dosen_pembimbing_pendukung); + if ($ratautama == "L") { + if ($ratapenting == "L") { + if (($ratapendukung == "L") || ($ratapendukung=="M")) { + $sidangtesis->nilai = "A"; + } else { + $sidangtesis->nilai = "AB"; + } + } else { + $sidangtesis->nilai = "AB"; + } + } else { + if ($ratautama == "M") { + if (($ratapenting == "L") || ($ratapenting=="M")) { + if (($ratapendukung == "L") || ($ratapendukung=="M")) { + $sidangtesis->nilai = "B"; + } + } else { + if (($ratapendukung == "L") || ($ratapendukung=="M")) { + $sidangtesis->nilai = "BC"; + } else { + $sidangtesis->nilai = "C"; + } + } + } else { + $sidangtesis->nilai = "E"; + } + } + } + $sidangtesis->save(); + return back(); } else { return abort(403); } diff --git a/app/SeminarTesis.php b/app/SeminarTesis.php index 84081f8788cea24a9175cef93f22a173f9f4f1b4..c95bac65520b0f9851caeceebb1eed80847ed066 100644 --- a/app/SeminarTesis.php +++ b/app/SeminarTesis.php @@ -8,7 +8,7 @@ class SeminarTesis extends Model { // protected $fillable =[ - 'tesis_id','tempat','hari','tanggal','approval_pembimbing1','approval_pembimbing2','issuer_id','evaluator_id','verdict', 'waktu' + 'tesis_id','tempat','hari','tanggal','approval_pembimbing1','approval_pembimbing2','issuer_id','evaluator_id','verdict', 'waktu', 'draft_laporan' ]; public function getApprovalStringPembimbing1() { diff --git a/app/SidangTesis.php b/app/SidangTesis.php index 5f3554870b2f6402ad616f14989fc0a4aec941fc..1a642dee658ecb8da457a2cb9499bc173062efa6 100644 --- a/app/SidangTesis.php +++ b/app/SidangTesis.php @@ -8,7 +8,7 @@ class SidangTesis extends Model { protected $table = 'sidang_tesis'; protected $fillable = - ['thesis_id','id','nilai', 'tanggal', 'jam','dosen_penguji_1','dosen_penguji_2','nilai_dosen_penguji_1_utama'.'nilai_dosen_penguji_2_utama','nilai_dosen_pembimbing_utama','nilai_dosen_penguji_1_penting'.'nilai_dosen_penguji_2_penting','nilai_dosen_pembimbing_penting','nilai_dosen_penguji_1_pendukung'.'nilai_dosen_penguji_2_pendukung','nilai_dosen_pembimbing_pendukung','nilai_dosen_kelas_penting','nilai_dosen_kelas_utama']; + ['thesis_id','id','nilai', 'tanggal', 'jam','dosen_penguji_1','dosen_penguji_2','nilai_dosen_penguji_1_utama'.'nilai_dosen_penguji_2_utama','nilai_dosen_pembimbing_utama','nilai_dosen_penguji_1_penting'.'nilai_dosen_penguji_2_penting','nilai_dosen_pembimbing_penting','nilai_dosen_penguji_1_pendukung'.'nilai_dosen_penguji_2_pendukung','nilai_dosen_pembimbing_pendukung','nilai_dosen_kelas_penting','nilai_dosen_kelas_utama','semeste_terdaftar']; public function tesis() { return $this->belongsTo('App\Thesis', 'thesis_id','id'); diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php index 36e962c73c7d1565786dc5aa9618660f79a45e3e..e6e84e9eeca712d25f4901f8ae705a96c9b72670 100644 --- a/resources/views/dosen/detail_mahasiswa.blade.php +++ b/resources/views/dosen/detail_mahasiswa.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', 'List Pengajuan Topik') +@section('title', 'Detail Mahasiswa') @section('content') @@ -88,7 +88,6 @@ </div> <fieldset disabled="disabled"> @endif - @endif <div class="row justify-content-center"> <form action="/sidangtesis/nilai/{{$user->username}}" method="post" class="width-full"> @@ -153,9 +152,10 @@ </form> </div> </fieldset> - @endif + @endif @endif @endif + @endif @if($tesis->sidangTesis()) <div class="mb-2"> <h3> @@ -274,7 +274,8 @@ </fieldset> @endif @if($seminarTesis) - @if($seminarTesis->tesis->dosen_pembimbing1 == Auth::user()->id && $seminarTesis->approval_pembimbing1 && ($seminarTesis->approval_pembimbing2 || !$tesis->dosen_pembimbing2)) + @if($mahasiswa->status != \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS) + @if($seminarTesis->tesis->dosen_pembimbing1 == Auth::user()->id && $seminarTesis->approval_pembimbing1 && ($seminarTesis->approval_pembimbing2 || !$tesis->dosen_pembimbing2) && ($seminarTesis->draft_laporan)) <div class="mb-2"> <h3> Penilaian Seminar Tesis @@ -306,6 +307,7 @@ </fieldset> @endif @endif + @endif @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS) <div class="control-seminar-tesis mb-2"> @@ -457,7 +459,7 @@ <!-- Modal body --> <div class="modal-body"> <h5>Dosen Pembimbing: </h5> - <p>{{$item->name}}</p> + <p>{{$item->dosen_pembimbing->user1()->name}}</p> <h5>Waktu Bimbingan: </h5> <p>{{$item->tanggal_waktu}}</p> <h5>Hasil dan diskusi: </h5> diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php index 12bd71f9544c7c0f17f91a9047dea327992fc0af..3c5227188e3d402a4b9c6951d46e30b89d5646b5 100644 --- a/resources/views/dosen/index.blade.php +++ b/resources/views/dosen/index.blade.php @@ -40,16 +40,144 @@ <!-- <div class="row"> <div class="col"> --> <h3>Daftar Mahasiswa</h3> - + <hr/> <div id="accordion"> + @if($kelas->id_dosen_kelas == $dosen->id) + <div class="card"> + <div class="card-header"> + <a class="card-link" data-toggle="collapse" href="#collapseThree"> + Mahasiswa Kelas Tesis + </a> + </div> + <div id="collapseThree" class="collapse show" data-parent="#accordion"> + <div class="card-body"> + <div class="row justify-content-center"> + <table class="mahasiswa-control-table width-full table table-hover"> + <thead> + <tr class="text-center"> + <th> + No + </th> + <th> + Nama + </th> + <th> + NIM + </th> + <!-- <th> + Status + </th> --> + <th></th> + </tr> + </thead> + @foreach($mahasiswakelas as $item) + @php($user = $item->user()) + <tr class="text-center" > + <td> + {{$loop->iteration}} + </td> + <td> + {{$user->name}} + </td> + <td> + {{$user->username}} + </td> + <!-- <td> + {{$item->getStatusString()}} + </td> --> + <td> + <div class="display-flex justify-content-start align-items-center"> + @php($tesis = $item->tesis()) + @php($st = $tesis->sidangTesis()) + @if(!is_null($st->nilai_dosen_kelas_utama)) + <button class="btn btn-grey" data-toggle="modal" data-target="#kelas{{$loop->iteration}}"> + Nilai + </button> + @else + <button class="btn btn-green" data-toggle="modal" data-target="#kelas{{$loop->iteration}}"> + Nilai + </button> + @endif + </div> + + <div class="modal fade" id="kelas{{$loop->iteration}}"> + <div class="modal-dialog"> + <div class="modal-content"> + + <!-- Modal Header --> + <div class="modal-header"> + <h4 class="modal-title">Penilaian Sidang: {{$user->name}}</h4> + <button type="button" class="close" data-dismiss="modal">×</button> + </div> + + <!-- Modal body --> + <div class="modal-body"> + <form action="/sidangtesis/nilai/{{$user->username}}" method="post" class="width-full"> + {{csrf_field()}} + + @if(!is_null($st->nilai_dosen_kelas_utama)) + <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> + <i class="material-icons font-size-18-px mr-2">check_circle</i> + Anda telah melakukan penilaian terhadap mahasiswa yang bersangkutan silakan hubungi Admin untuk perubahan nilai. + </div> + <fieldset disabled="disabled"> + @endif + <input type="hidden" value="{{$user->username}}" name="mahasiswa"> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Utama</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama"> + @if($st->nilai_dosen_kelas_utama == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_kelas_utama == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_kelas_utama == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <button class="col-md-4 btn btn-blue ml-1 mr-1"> + Tetapkan + </button> + </div> + </fieldset> + </form> + + </div> + + + + + <!-- Modal footer --> + <div class="modal-footer"> + <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button> + </div> + + </div> + </div> + </div> + </td> + </tr> + @endforeach + </table> + </div> + </div> + </div> + @endif + + <div class="card"> <div class="card-header"> <a class="card-link" data-toggle="collapse" href="#collapseOne"> Mahasiswa Bimbingan </a> </div> - <div id="collapseOne" class="collapse show" data-parent="#accordion"> + <div id="collapseOne" class="collapse" data-parent="#accordion"> <div class="card-body"> <div class="row justify-content-center"> <table class="mahasiswa-control-table width-full table table-hover"> @@ -191,41 +319,265 @@ </div> @endif @endforeach - {{--<div class="row justify-content-center">--}} - {{--<table class="mahasiswa-control-table">--}} - {{--<tr class="text-center">--}} - {{--<th>--}} - {{--No--}} - {{--</th>--}} - {{--<th>--}} - {{--Nama--}} - {{--</th>--}} - {{--<th>--}} - {{--NIM--}} - {{--</th>--}} - {{--<th>--}} - {{--Status--}} - {{--</th>--}} - {{--</tr>--}} - {{--@foreach($mahasiswauji as $item)--}} - {{--@php($user = $item->user())--}} - {{--<tr class="text-center">--}} - {{--<td>--}} - {{--{{$loop->iteration}}--}} - {{--</td>--}} - {{--<td>--}} - {{--{{$user->name}}--}} - {{--</td>--}} - {{--<td>--}} - {{--{{$user->username}}--}} - {{--</td>--}} - {{--<td>--}} - {{--{{$item->getStatusString()}}--}} - {{--</td>--}} - {{--</tr>--}} - {{--@endforeach--}} - {{--</table>--}} - {{--</div>--}} + </div> + + @foreach($dosen->sidangTesisApproved() as $st) + @if(($st->dosen_penguji_1 == $cuser->id) || ($st->dosen_penguji_2 == $cuser->id)) + @php($tesis = $st->tesis) + @php($mhs = $tesis->mahasiswa) + @php($usr = $mhs->user()) + <div class="card-body"> + <div class="border border-color-black pt-1 pr-1 pl-1 pb-1"> + <div class="row"> + <table class="col-md-8"> + <tr> + <td> + Mahasiswa + </td> + <td> + : + </td> + <td> + {{$usr->name}} + </td> + </tr> + <tr> + <td> + Jadwal + </td> + <td> + : + </td> + <td> + {{date("d M Y H:iA", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}} + </td> + </tr> + + <tr> + <td> + Tempat + </td> + <td> + : + </td> + <td> + {{$st->tempat}} + </td> + </tr> + <tr> + <td> + Judul Tesis + </td> + <td> + : + </td> + <td> + {{$tesis->topic}} + </td> + </tr> + <tr> + <td> + Dosen Pembimbing + </td> + <td> + : + </td> + <td> + {{$tesis->dosen_pembimbing_1->user->name}} + </td> + </tr> + </table> + <div class="display-flex justify-content-start align-items-center"> + @if($st->dosen_penguji_1 == $dosen->id) + @if(!is_null($st->nilai_dosen_penguji_1_utama)) + <button class="btn btn-grey" data-toggle="modal" data-target="#uji{{$loop->iteration}}"> + Nilai + </button> + @else + ` <button class="btn btn-green" data-toggle="modal" data-target="#uji{{$loop->iteration}}"> + Nilai + </button> + @endif + @elseif($st->dosen_penguji_2 == $dosen->id) + @if(!is_null($st->nilai_dosen_penguji_2_utama)) + <button class="btn btn-grey" data-toggle="modal" data-target="#uji{{$loop->iteration}}"> + Nilai + </button> + @else + ` <button class="btn btn-green" data-toggle="modal" data-target="#uji{{$loop->iteration}}"> + Nilai + </button> + @endif + @endif + + + + <div class="modal fade" id="uji{{$loop->iteration}}"> + <div class="modal-dialog"> + <div class="modal-content"> + + <!-- Modal Header --> + <div class="modal-header"> + <h4 class="modal-title">Penilaian Sidang: {{$usr->name}}</h4> + <button type="button" class="close" data-dismiss="modal">×</button> + </div> + + <!-- Modal body --> + <div class="modal-body"> + <form action="/sidangtesis/nilai/{{$usr->username}}" method="post" class="width-full"> + {{csrf_field()}} + + @if(!is_null($st->nilai_dosen_penguji_1_utama) && !is_null($st->nilai_dosen_penguji_2_utama)) + <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> + <i class="material-icons font-size-18-px mr-2">check_circle</i> + Anda telah melakukan penilaian terhadap mahasiswa yang bersangkutan silakan hubungi Admin untuk perubahan nilai. + </div> + <fieldset disabled="disabled"> + @endif + @if($st->dosen_penguji_1 == $dosen->id) + <input type="hidden" value="{{$usr->username}}" name="mahasiswa"> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Utama</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama"> + @if($st->nilai_dosen_penguji_1_utama == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_1_utama == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_1_utama == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexPenting" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Penting</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexPenting" + > + @if($st->nilai_dosen_penguji_1_penting == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_1_penting == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_1_penting == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexPendukung" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Pendukung</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexPendukung" + > + @if($st->nilai_dosen_penguji_1_pendukung == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_1_pendukung == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_1_pendukung == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <button class="col-md-4 btn btn-blue ml-1 mr-1"> + Tetapkan + </button> + </div> + </div> + @endif + + @if($st->dosen_penguji_2 == $dosen->id) + @if(!is_null($st->nilai_dosen_penguji_2_utama)) + <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> + <i class="material-icons font-size-18-px mr-2">check_circle</i> + Anda telah melakukan penilaian terhadap mahasiswa yang bersangkutan silakan hubungi Admin untuk perubahan nilai. + </div> + <fieldset disabled="disabled"> + @endif + <input type="hidden" value="{{$usr->username}}" name="mahasiswa"> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Utama</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama"> + @if($st->nilai_dosen_penguji_2_utama == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_2_utama == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_2_utama == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexPenting" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Penting</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexPenting" + > + @if($st->nilai_dosen_penguji_2_penting == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_2_penting == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_2_penting == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <label for="scoreIndexPendukung" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Komponen Pendukung</label> + <select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexPendukung" + > + @if($st->nilai_dosen_penguji_2_pendukung == "L") + <option selected ="selected" value="L">L</option> + @elseif ($st->nilai_dosen_penguji_2_pendukung == "M") + <option selected ="selected" value="M">M</option> + @elseif ($st->nilai_dosen_penguji_2_pendukung == "K") + <option selected ="selected" value="K">K</option> + @else + <option value="L">L</option> + <option value="M">M</option> + <option value="K">K</option> + @endif + </select> + </div> + <div class="form-group row width-full justify-content-center"> + <button class="col-md-2 btn btn-blue ml-1 mr-1"> + Tetapkan + </button> + </div> + </div> + @endif + + </form> + </fieldset> + + <!-- Modal footer --> + <div class="modal-footer"> + <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button> + </div> + + </div> + </div> + </div> + </div> + </div> + </div> + @endif + @endforeach + </div> </div> </div> </div> @@ -305,7 +657,7 @@ @endif @endif @endif -x @endif + @endif @endforeach @foreach($dosen->upcomingSidangAsPenguji1 as $st) @php($user = $st->tesis->mahasiswa->user()) @@ -318,8 +670,10 @@ x @endif <div class="col"> <div class="row mb-4"> <div class="col"> + @php($tsis = $st->tesis) + @php($useruji = $tsis->mahasiswa->user()) <h5><span class="badge badge-success">Sidang Tesis</span></h5> - <h4>{{$user->name}} - {{$user->username}}</h4> + <h4>{{$useruji->name}} - {{$useruji->username}}</h4> <h6> Topik: {{$st->tesis->topic}} <br> Dosen Pembimbing 1 : {{$st->tesis->dosen_pembimbing_1->user->name}} @@ -353,8 +707,10 @@ x @endif <div class="col"> <div class="row mb-4"> <div class="col"> - <h5><span class="badge badge-sucess">Sidang Tesis</span></h5> - <h4>{{$user->name}} - {{$user->username}}</h4> + @php($tsis2 = App\Thesis::where('id', $st->thesis_id)->first()) + @php($useruji2 = App\Mahasiswa::where('id', $tsis2->mahasiswa_id)->first()->user()) + <h5><span class="badge badge-success">Sidang Tesis</span></h5> + <h4>{{$useruji2->name}} - {{$useruji2->username}}</h4> <h6> Topik: {{$st->tesis->topic}} <br> Dosen Pembimbing 1 : {{$st->tesis->dosen_pembimbing_1->user->name}} @@ -379,7 +735,6 @@ x @endif @endforeach </div> - </div> </div> </div> diff --git a/resources/views/mahasiswa/index.blade.php b/resources/views/mahasiswa/index.blade.php index c425e3e15dfac969b2864574c254c944be51a39a..9e0e885ebf4e454356437d713fd8ee79a8920dd7 100644 --- a/resources/views/mahasiswa/index.blade.php +++ b/resources/views/mahasiswa/index.blade.php @@ -183,13 +183,13 @@ </div> <div class="tab-content"> - @if($mahasiswa->status < \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK) + @if($mahasiswa->status < \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK and $mahasiswa->status > \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div id="step1" class="container tab-pane fade active show"> @else <div id="step1" class="container tab-pane fade"> @endif <h3 class="header">Seminar Topik</h3> - @if ($mahasiswa->seminarTopik() and $mahasiswa->status!=\App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK and $mahasiswa->status!=\App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + @if ($mahasiswa->seminarTopik() and $mahasiswa->status>=\App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK) <p>Jadwal yang ditetapkan: <h4><span class="badge badge-info">{{date("d M Y H:i:s", strtotime($mahasiswa->seminarTopik()->schedule.'UTC'))}}</span></h4></p> @endif @@ -338,8 +338,8 @@ <a class="btn btn-blue" href="/topik/pengajuan" role="button">Ajukan Topik</a> @endif </div> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK && - $mahasiswa->status < \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL) + @if(($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK && + $mahasiswa->status < \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL) || $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div id="step2" class="container tab-pane fade active show"> @else <div id="step2" class="container tab-pane fade"> @@ -372,14 +372,18 @@ </div> <br> <a class="btn btn-blue" href="/proposal/upload" role="button">Edit Proposal</a> - @elseif($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK) - <p>Anda dapat mengunggah proposal topik tesis.</p> + @elseif($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK || $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + @if($mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + <p>Proposal Anda ditolak. Anda dapat menggungah proposal kembali.</p> + @else + <p>Anda dapat mengunggah proposal topik tesis.</p> + @endif <a class="btn btn-blue" href="/proposal/upload" role="button">Unggah Proposal</a> @endif </div> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL && - $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) + @if(($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL && + $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) || $mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS) <div id="step3" class="container tab-pane fade active show"> @else <div id="step3" class="container tab-pane fade"> @@ -392,6 +396,13 @@ <div>Dosen Pembimbing 2: {{$tesis->dosen_pembimbing_2->user->name}}</div> @endif @endif + @if($tesis) + @if(isset($tesis->seminarTesis()->hari) && isset($tesis->seminarTesis()->waktu)) + @php($tesis_hari = $tesis->seminarTesis()->hari) + @php($tesis_waktu = $tesis->seminarTesis()->waktu) + <p>Jadwal yang ditetapkan: <h4><span class="badge badge-info">{{$tesis_hari}} {{$tesis_waktu}}</span></h4></p> + @endif + @endif <p>Anda dapat mengunggah hasil bimbingan setiap kali selesai bimbingan.</p> <a class="btn btn-blue" href="/hasilbimbingan/tambah" role="button">Entri Hasil Bimbingan</a> <a class="btn btn-outline-dark" href="/hasilbimbingan/mahasiswa" role="button">Lihat Hasil Bimbingan</a> diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php index 0912d4abb7d101102d6f944ee2e9ac1f67c6cf75..a0c3d5da7a8279a40a72419e372ab76d0d754d96 100644 --- a/resources/views/manajer/detail_mahasiswa_control.blade.php +++ b/resources/views/manajer/detail_mahasiswa_control.blade.php @@ -67,12 +67,12 @@ <!-- Tab panes --> <div class="tab-content"> <div id="topik" class="container tab-pane active"><br> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK ) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK || $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div class="control-seminar-topik mb-4"> <h3> Penilaian Seminar Topik </h3> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_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"> <i class="material-icons font-size-18-px mr-2">check_circle</i>   Kelulusan seminar topik ditetapkan oleh {{$seminarTopik->evaluator->name}} @@ -107,14 +107,14 @@ @endif </div> @endif - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_DITERIMA || $mahasiswa->status < \App\Mahasiswa::STATUS_TOPIK_DITOLAK) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_DITERIMA || $mahasiswa->status < \App\Mahasiswa::STATUS_TOPIK_DITOLAK || $mahasiswa->status > \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div class="control-jadwal mb-4"> <h3> Penetapan Jadwal Seminar Topik </h3> <div> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK) + @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"> <i class="material-icons font-size-18-px mr-2">check_circle</i>   Jadwal seminar topik ditetapkan oleh {{$seminarTopik->creator->name}} @@ -253,7 +253,7 @@ <h3> Penetapan Dosen Pembimbing </h3> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL) <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> <i class="material-icons font-size-18-px mr-2">check_circle</i>   Dosen pembimbing telah ditetapkan oleh {{$tesis->creator_admin->name}} @@ -340,7 +340,7 @@ <h3> Penilaian Seminar Proposal </h3> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL) <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> <i class="material-icons font-size-18-px mr-2">check_circle</i>   Kelulusan seminar proposal ditetapkan oleh {{$seminarTopik->evaluator->name}} @@ -348,7 +348,7 @@ </div> <fieldset disabled="disabled"> - @elseif($mahasiswa->status <= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL) + @elseif($mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL) <div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap"> <i class="material-icons font-size-18-px mr-2">cancel</i> Seminar Topik dinyatakan tidak lulus oleh {{$seminarTopik->evaluator->name}} @@ -388,12 +388,12 @@ @endif - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA || $mahasiswa->status <= \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA and $mahasiswa->status != \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div class="control-pengajuan-proposal mb-4"> <h3> Penetapan Seminar Proposal </h3> - @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL) + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL || $mahasiswa->status < \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) <div class="alert alert-success row align-items-center"> <i class="material-icons font-size-18-px">check_circle</i>   Jadwal seminar proposal ditetapkan oleh {{$seminarProposal->creator->name}} @@ -458,12 +458,16 @@ {{csrf_field()}} <input type="hidden" value="{{$mahasiswa->id}}" name="mahasiswa"> <input type="hidden" value="{{$proposal->id}}" name="proposal"> + @if($mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + <fieldset disabled="disabled"> + @endif <button class="btn btn-red mr-1" name="action" value="0"> Tolak </button> <button class="btn btn-blue ml-1" name="action" value="1"> Terima </button> + </fieldset> </div> </form> @@ -471,11 +475,7 @@ @if($proposal->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA) </fieldset> @endif - </div> - - @endif - </div> <div id="bimbingan" class="container tab-pane fade"><br> @@ -541,7 +541,7 @@ <!-- Modal body --> <div class="modal-body"> <h5>Dosen Pembimbing: </h5> - <p>{{$item->name}}</p> + <p>{{$item->dosen_pembimbing->user1()->name}}</p> <h5>Waktu Bimbingan: </h5> <p>{{$item->tanggal_waktu}}</p> <h5>Hasil dan diskusi: </h5> @@ -585,6 +585,7 @@ </div> <fieldset disabled="disabled"> @endif + @if($mahasiswa->status != \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS) <div> <form action="/seminartesis/edit/{{$user->username}}" method="post"> {{csrf_field()}} @@ -662,6 +663,7 @@ </div> </form> </div> + @endif </div> @endif </div> @@ -790,7 +792,7 @@ <div class="form-group row col-md-12"> <label for="semester-daftar" class="col-md-4 col-form-label text-md-right text-center">Terdaftar pada Semester<sup>*</sup></label> <div class="display-flex align-items-center"> - {{$sidangTesis->semesterTerdaftar}} + {{$sidangTesis->semester_terdaftar}} </div> </div> <div class="form-group row col-md-12"> diff --git a/resources/views/manajer/nilai_akhir_mahasiswa.blade.php b/resources/views/manajer/nilai_akhir_mahasiswa.blade.php index 548112260fc1a8cd59a3233c5bee6f5957570f86..dc31ad7870ad9ba2908b928d22c7953762c15dba 100644 --- a/resources/views/manajer/nilai_akhir_mahasiswa.blade.php +++ b/resources/views/manajer/nilai_akhir_mahasiswa.blade.php @@ -46,7 +46,7 @@ {{$item->tesis->mahasiswa->user()->name}} </td> <td> - {{$item->tesis->nilai}} + {{$item->nilai}} </td> <td> {{$item->tesis->topic}} @@ -55,7 +55,7 @@ {{$item->tesis->dosen_pembimbing_1->user->name}} </td> <td> - {{$item->dosen_penguji}} + {{$item->dosen_penguji1->name}} </td> </tr> @endforeach