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/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index d397594592538e5dcb7b1299fa5a66241b1f57cf..e8990df4fb9836c80a2f07ae17ea9172a6c3257a 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
+use App\KelasTesis;
use App\User;
use App\Manajer;
use App\Dosen;
@@ -95,7 +96,8 @@ class RegisterController extends Controller
if($role == User::ROLE_DOSEN) {
Dosen::create(['id'=>$user->id]);
}else if($role == User::ROLE_MAHASISWA) {
- Mahasiswa::create(['id'=>$user->id]);
+ $id_kelas_tesis = KelasTesis::orderByRaw('updated_at - created_at DESC')->first();
+ Mahasiswa::create(['id'=>$user->id, 'id_kelas_tesis'=>$id_kelas_tesis->id]);
} else if($role == User::ROLE_MANAJER) {
Manajer::create(['id'=>$user->id]);
}
diff --git a/app/Http/Controllers/DosenController.php b/app/Http/Controllers/DosenController.php
index 2865e9a517913d9a3a75a83cd23c88188b1d3056..269bbf5a8a38db908d17d370dee5426ba12c8f39 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();
-
- return view('dosen.index', ['mahasiswabimbingan' => $mahasiswabimbingan]);
+ $mahasiswakelas = Mahasiswa::where('status','>=',14)->get();
+ //$kelas = KelasTesis::orderByRaw('updated_at - created_at DESC')->first();
+ $kelas = KelasTesis::where('id_dosen_kelas',$iddosen)->get();
+ 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..bed152cfef3cc28ada229da1d2bbbed3d3598866 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,8 @@ class SidangTesisController extends Controller
if(!$tesis)
return abort(400);
$sidangtesis = $tesis->sidangTesis();
+ //$kelas = KelasTesis::orderByRaw('updated_at - created_at DESC')->first();
+ $kelas = KelasTesis::where('id_dosen_kelas',$currentUser->id);
if(!$sidangtesis)
return abort(400);
else {
@@ -55,9 +58,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 +106,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);
@@ -147,7 +152,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 +160,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 +188,50 @@ class SidangTesisController extends Controller
}
$sidangtesis->save();
return back();
+ }else if(count($kelas) > 0) {
+ $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/Mahasiswa.php b/app/Mahasiswa.php
index e079fbf79787747993f104e2881c2207df9e083f..dcc622edc53666390e503d700ccffc203cdb041a 100644
--- a/app/Mahasiswa.php
+++ b/app/Mahasiswa.php
@@ -58,7 +58,7 @@ class Mahasiswa extends Model
"-9" => "Gagal Seminar Proposal",
"-13" => "Gagal Seminar Tesis"
];
- protected $fillable= ['id'];
+ protected $fillable= ['id','id_kelas_tesis'];
public function getStatus($status) {
return Mahasiswa::STATUS_STRINGS[$status];
}
@@ -112,6 +112,6 @@ class Mahasiswa extends Model
}
public function kelasTesis() {
- return $this->belongsTo('App\KelasThesis','id_kelas_tesis','id');
+ return $this->belongsTo('App\KelasTesis','id_kelas_tesis','id');
}
}
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..41ed852e6af4c239c5d0822d55546cf10a1fb85f 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">
@@ -99,14 +98,14 @@
<select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama"
>
@if($sidangTesis->nilai_dosen_pembimbing_utama == "L")
- <option selected ="selected" value="L">L</option>
+ <option selected ="selected" value="L">B</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_utama == "M")
- <option selected ="selected" value="M">M</option>
+ <option selected ="selected" value="M">C</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_utama == "K")
<option selected ="selected" value="K">K</option>
@else
- <option value="L">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -116,14 +115,14 @@
<select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexPenting"
>
@if($sidangTesis->nilai_dosen_pembimbing_penting == "L")
- <option selected ="selected" value="L">L</option>
+ <option selected ="selected" value="L">B</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_penting == "M")
- <option selected ="selected" value="M">M</option>
+ <option selected ="selected" value="M">C</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_penting == "K")
<option selected ="selected" value="K">K</option>
@else
- <option value="L">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -133,14 +132,14 @@
<select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexPendukung"
>
@if($sidangTesis->nilai_dosen_pembimbing_pendukung == "L")
- <option selected ="selected" value="L">L</option>
+ <option selected ="selected" value="L">B</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_pendukung == "M")
- <option selected ="selected" value="M">M</option>
+ <option selected ="selected" value="M">C</option>
@elseif ($sidangTesis->nilai_dosen_pembimbing_pendukung == "K")
<option selected ="selected" value="K">K</option>
@else
- <option value="L">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -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..e471bf8da7b97e7511bc38d21b2330e8069f6041 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -40,16 +40,149 @@
<!-- <div class="row">
<div class="col"> -->
<h3>Daftar Mahasiswa</h3>
-
+
<hr/>
<div id="accordion">
+ @if(count($kelas) > 0)
+ <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())
+ @if($item->id_kelas_tesis != null)
+ @if($item->kelasTesis->id_dosen_kelas == $dosen->id)
+ <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">B</option>
+ @elseif ($st->nilai_dosen_kelas_utama == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_kelas_utama == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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>
+ @endif
+ @endif
+ @endforeach
+ </table>
+ </div>
+ </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,44 +324,413 @@
</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_1_utama == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_1_utama == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_1_penting == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_1_penting == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_1_pendukung == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_1_pendukung == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_2_utama == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_2_utama == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_2_penting == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_2_penting == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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">B</option>
+ @elseif ($st->nilai_dosen_penguji_2_pendukung == "M")
+ <option selected ="selected" value="M">C</option>
+ @elseif ($st->nilai_dosen_penguji_2_pendukung == "K")
+ <option selected ="selected" value="K">K</option>
+ @else
+ <option value="L">B</option>
+ <option value="M">C</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>
+ </div>
+ @endif
+ @endforeach
+ </div>
</div>
</div>
</div>
+
+ <div class="col col-md-6">
+ <!-- <h2>Jadwal Dosen</h2> -->
+
+
+ <!-- <h3>Jadwal</h3>
+ <hr/> -->
+ <h3>Jadwal</h3>
+ <hr/>
+
+ <div class="mt-5">
+ @php($currenttime = \Carbon\Carbon::now()->toDateString())
+ @foreach($mahasiswabimbingan as $item)
+ @php($user = $item->user())
+ @if($item->getHasilBimbingan()->count() > 0)
+ @php($jadwalbimbingan = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s",$item->gethasilBimbingan()[0]->waktu_bimbingan_selanjutnya))
+ @if($jadwalbimbingan >= $currenttime)
+ <div class="row">
+ <div class="col-md-4 text-center" style="border-right: 1px solid grey">
+ <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
+ <div>{{$jadwalbimbingan->format('d M Y')}}</div>
+ </div>
+ <div class="col">
+ <div class="row mb-4">
+ <div class="col">
+ <h5><span class="badge badge-info">Bimbingan</span></h5>
+ <h4>{{$user->name}} - {{$user->username}}</h4>
+ <h5>
+ <span class="badge badge-primary">Tempat: Ruang dosen</span>
+ <span class="badge badge-primary">Waktu: {{$jadwalbimbingan->format('g:i A')}}</span>
+ </h5>
+ </div>
+ </div>
+ </div>
+ </div>
+ @endif
+ @endif
+ @if(!is_null($item->tesis()))
+ @php($seminar = $item->tesis()->seminarTesis())
+ @if(!is_null($seminar))
+ @php($date = $seminar->hari)
+ @php($time = $seminar->waktu)
+ @if(!is_null($date) && !is_null($time))
+ @php($datetimeString = $date." ".$time)
+ @php($jadwalseminar = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s", $datetimeString))
+ @if($jadwalseminar >= $currenttime)
+ <div class="row">
+ <div class="col-md-4 text-center" style="border-right: 1px solid grey">
+ <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
+ <div>{{$jadwalseminar->format('d M Y')}}</div>
+ </div>
+ <div class="col">
+ <div class="row mb-4">
+ <div class="col">
+ <h5><span class="badge badge-warning text-color-white">Seminar Tesis</span></h5>
+ <h4>{{$user->name}} - {{$user->username}}</h4>
+ <h5>
+ <span class="badge badge-primary">Tempat: {{$seminar->tempat}}</span>
+ <span class="badge badge-primary">Waktu: {{$jadwalseminar->format('g:i A')}}</span>
+ </h5>
+ </div>
+ </div>
+ </div>
+ </div>
+ @endif
+ @endif
+ @endif
+ @endif
+ @endforeach
+ @foreach($dosen->upcomingSidangAsPenguji1 as $st)
+ @php($user = $st->tesis->mahasiswa->user())
+ @if($st->tanggal.'T'.$st->waktu >= $currenttime)
+ <div class="row">
+ <div class="col-md-4 text-center" style="border-right: 1px solid grey">
+ <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
+ <div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
+ </div>
+ <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>{{$useruji->name}} - {{$useruji->username}}</h4>
+ <h6>
+ Topik: {{$st->tesis->topic}} <br>
+ Dosen Pembimbing 1 : {{$st->tesis->dosen_pembimbing_1->user->name}}
+ <br>
+ @if($st->tesis->dosen_pembimbing_2)
+ Dosen Pembimbing 2 : {{$st->tesis->dosen_pembimbing_2->user->name}}
+ @endif
+ <br>
+ Dosen Penguji 1 : {{$st->dosen_penguji1->name}}
+ <br>
+ Dosen Penguji 2 : {{$st->dosen_penguji2->name}}
+ </h6>
+ <h5>
+ <span class="badge badge-primary">Tempat: {{$st->tempat}}</span>
+ <span class="badge badge-primary">Waktu: {{date("g:i A",strtotime($st->waktu))}}</span>
+ </h5>
+ </div>
+ </div>
+ </div>
+ </div>
+ @endif
+ @endforeach
+ @foreach($dosen->upcomingSidangAsPenguji2 as $st)
+ @php($user = $st->tesis->mahasiswa->user())
+ @if($st->tanggal.'T'.$st->waktu >= $currenttime)
+ <div class="row">
+ <div class="col-md-4 text-center" style="border-right: 1px solid grey">
+ <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
+ <div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
+ </div>
+ <div class="col">
+ <div class="row mb-4">
+ <div class="col">
+ @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}}
+ <br>
+ @if($st->tesis->dosen_pembimbing_2)
+ Dosen Pembimbing 2 : {{$st->tesis->dosen_pembimbing_2->user->name}}
+ @endif
+ <br>
+ Dosen Penguji 1 : {{$st->dosen_penguji1->name}}
+ <br>
+ Dosen Penguji 2 : {{$st->dosen_penguji2->name}}
+ </h6>
+ <h5>
+ <span class="badge badge-primary">Tempat: {{$st->tempat}}</span>
+ <span class="badge badge-primary">Waktu: {{date("g:i A",strtotime($st->waktu))}}</span>
+ </h5>
+ </div>
+ </div>
+ </div>
+ </div>
+ @endif
+ @endforeach
+ </div>
+ </div>
</div>
<!-- </div> -->
@@ -237,150 +739,9 @@
<!-- </div> -->
<!-- </div> -->
-
- </div>
- <div class="col col-md-6">
- <!-- <h2>Jadwal Dosen</h2> -->
-
-
- <!-- <h3>Jadwal</h3>
- <hr/> -->
- <h3>Jadwal</h3>
- <hr/>
-
- <div class="mt-5">
- @php($currenttime = \Carbon\Carbon::now()->toDateString())
- @foreach($mahasiswabimbingan as $item)
- @php($user = $item->user())
- @if($item->getHasilBimbingan()->count() > 0)
- @php($jadwalbimbingan = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s",$item->gethasilBimbingan()[0]->waktu_bimbingan_selanjutnya))
- @if($jadwalbimbingan >= $currenttime)
- <div class="row">
- <div class="col-md-4 text-center" style="border-right: 1px solid grey">
- <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
- <div>{{$jadwalbimbingan->format('d M Y')}}</div>
- </div>
- <div class="col">
- <div class="row mb-4">
- <div class="col">
- <h5><span class="badge badge-info">Bimbingan</span></h5>
- <h4>{{$user->name}} - {{$user->username}}</h4>
- <h5>
- <span class="badge badge-primary">Tempat: Ruang dosen</span>
- <span class="badge badge-primary">Waktu: {{$jadwalbimbingan->format('g:i A')}}</span>
- </h5>
- </div>
- </div>
- </div>
- </div>
- @endif
- @endif
- @if(!is_null($item->tesis()))
- @php($seminar = $item->tesis()->seminarTesis())
- @if(!is_null($seminar))
- @php($date = $seminar->hari)
- @php($time = $seminar->waktu)
- @if(!is_null($date) && !is_null($time))
- @php($datetimeString = $date." ".$time)
- @php($jadwalseminar = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s", $datetimeString))
- @if($jadwalseminar >= $currenttime)
- <div class="row">
- <div class="col-md-4 text-center" style="border-right: 1px solid grey">
- <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
- <div>{{$jadwalseminar->format('d M Y')}}</div>
- </div>
- <div class="col">
- <div class="row mb-4">
- <div class="col">
- <h5><span class="badge badge-warning text-color-white">Seminar Tesis</span></h5>
- <h4>{{$user->name}} - {{$user->username}}</h4>
- <h5>
- <span class="badge badge-primary">Tempat: {{$seminar->tempat}}</span>
- <span class="badge badge-primary">Waktu: {{$jadwalseminar->format('g:i A')}}</span>
- </h5>
- </div>
- </div>
- </div>
- </div>
- @endif
- @endif
- @endif
-x @endif
- @endforeach
- @foreach($dosen->upcomingSidangAsPenguji1 as $st)
- @php($user = $st->tesis->mahasiswa->user())
- @if($st->tanggal.'T'.$st->waktu >= $currenttime)
- <div class="row">
- <div class="col-md-4 text-center" style="border-right: 1px solid grey">
- <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
- <div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
- </div>
- <div class="col">
- <div class="row mb-4">
- <div class="col">
- <h5><span class="badge badge-success">Sidang Tesis</span></h5>
- <h4>{{$user->name}} - {{$user->username}}</h4>
- <h6>
- Topik: {{$st->tesis->topic}} <br>
- Dosen Pembimbing 1 : {{$st->tesis->dosen_pembimbing_1->user->name}}
- <br>
- @if($st->tesis->dosen_pembimbing_2)
- Dosen Pembimbing 2 : {{$st->tesis->dosen_pembimbing_2->user->name}}
- @endif
- <br>
- Dosen Penguji 1 : {{$st->dosen_penguji1->name}}
- <br>
- Dosen Penguji 2 : {{$st->dosen_penguji2->name}}
- </h6>
- <h5>
- <span class="badge badge-primary">Tempat: {{$st->tempat}}</span>
- <span class="badge badge-primary">Waktu: {{date("g:i A",strtotime($st->waktu))}}</span>
- </h5>
- </div>
- </div>
- </div>
- </div>
- @endif
- @endforeach
- @foreach($dosen->upcomingSidangAsPenguji2 as $st)
- @php($user = $st->tesis->mahasiswa->user())
- @if($st->tanggal.'T'.$st->waktu >= $currenttime)
- <div class="row">
- <div class="col-md-4 text-center" style="border-right: 1px solid grey">
- <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
- <div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
- </div>
- <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>
- <h6>
- Topik: {{$st->tesis->topic}} <br>
- Dosen Pembimbing 1 : {{$st->tesis->dosen_pembimbing_1->user->name}}
- <br>
- @if($st->tesis->dosen_pembimbing_2)
- Dosen Pembimbing 2 : {{$st->tesis->dosen_pembimbing_2->user->name}}
- @endif
- <br>
- Dosen Penguji 1 : {{$st->dosen_penguji1->name}}
- <br>
- Dosen Penguji 2 : {{$st->dosen_penguji2->name}}
- </h6>
- <h5>
- <span class="badge badge-primary">Tempat: {{$st->tempat}}</span>
- <span class="badge badge-primary">Waktu: {{date("g:i A",strtotime($st->waktu))}}</span>
- </h5>
- </div>
- </div>
- </div>
- </div>
- @endif
- @endforeach
- </div>
-
</div>
+
</div>
</div>
@endsection
diff --git a/resources/views/mahasiswa/form_pengajuan_topik.blade.php b/resources/views/mahasiswa/form_pengajuan_topik.blade.php
index 98175e6d658a852bc0a15baf1427ef4a666e4ae2..06c04484c2fc4f2e7e05afe2cede1ed4b6d910cb 100644
--- a/resources/views/mahasiswa/form_pengajuan_topik.blade.php
+++ b/resources/views/mahasiswa/form_pengajuan_topik.blade.php
@@ -18,7 +18,7 @@
<input type="text" v-model="topics[i].judul" id="judul" class="form-control col-md-8 " required>
</div>
<div class="form-group row col-md-12">
- <label for="keilmuan" class="col-md-4 col-form-label text-md-right text-center ">Area Keilmuan<sup>*</sup></label>
+ <label for="keilmuan" class="col-md-4 col-form-label text-md-right text-center ">Opsi <sup>*</sup></label>
<input type="text" id="keilmuan" v-model="topics[i].keilmuan" class="form-control col-md-8 " required>
</div>
<div class="form-group row col-md-12">
diff --git a/resources/views/mahasiswa/index.blade.php b/resources/views/mahasiswa/index.blade.php
index c425e3e15dfac969b2864574c254c944be51a39a..08d1b3697c3f8cdd4bb300e0f85fa0372a86d8ee 100644
--- a/resources/views/mahasiswa/index.blade.php
+++ b/resources/views/mahasiswa/index.blade.php
@@ -33,7 +33,7 @@
</div>
@endif
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL ||
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_DOSEN_PEMBIMBING_TELAH_DIPILIH ||
$mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
<div class="progress progress_2">
<div class="bar done"></div>
@@ -94,7 +94,7 @@
<div class="level level_2"><p>2</p></div>
@endif
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL ||
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_DOSEN_PEMBIMBING_TELAH_DIPILIH ||
$mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
<div class="level level_3 level_reached"><p>3</p></div>
@else
@@ -136,7 +136,7 @@
</a>
@endif
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL ||
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_DOSEN_PEMBIMBING_TELAH_DIPILIH ||
$mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
<a class="nav-link" data-toggle="tab" href="#step3">
<div class="level_text level3_text">
@@ -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_DOSEN_PEMBIMBING_TELAH_DIPILIH) || $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_DOSEN_PEMBIMBING_TELAH_DIPILIH &&
+ $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,12 +396,19 @@
<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>
</div>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS && $mahasiswa->status < \App\Mahasiswa::STATUS_LULUS)
<div id="step4" class="container tab-pane fade active show mt-4">
@else
<div id="step4" class="container tab-pane fade mt-4">
@@ -407,16 +418,28 @@
<a class="btn btn-blue" href="/sidangtesis/daftar" role="button">Daftar Sidang Tesis</a>
</div>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS)
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS )
<div id="step5" class="container tab-pane fade active show mt-4">
- @else
- <div id="step5" class="container tab-pane fade mt-4">
- @endif
<h3 class="header">Lulus</h3>
<p>Berikut ini hasil akhir Tesis Anda.</p>
- <p>Lorem ipsum</p>
+ <b>
+ @if($mahasiswa->tesis()->sidangTesis()->nilai=="E")
+ <font color="red">
+ TIDAK LULUS
+ @else
+ <font color="green">
+ {{$mahasiswa->tesis()->sidangTesis()->nilai}}
+ @endif
+ </font>
+ </b>
+
{{--<a class="btn btn-blue" href="/sidangtesis/daftar" role="button">Daftar Sidang Tesis</a>--}}
</div>
+ @else
+ <div id="step5" class="container tab-pane fade mt-4">
+ </div>
+ @endif
+
</div>
diff --git a/resources/views/mahasiswa/list_hasil_bimbingan.blade.php b/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
index d12b233f96125e7671a0a161cc4b9ace11ee8870..a0f5c43354e52b7935789a66efdaf9c0e54ace30 100644
--- a/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/list_hasil_bimbingan.blade.php
@@ -79,7 +79,8 @@
<p>{{$item->hasil_dan_diskusi}}</p>
<h5>Rencana tindak lanjut:</h5>
<p>{{$item->rencana_tindak_lanjut}}</p>
-
+ <h5>Waktu Bimbingan Selanjutnya: </h5>
+ <p>{{$item->waktu_bimbingan_selanjutnya}}</p>
</div>
<!-- Modal footer -->
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 0912d4abb7d101102d6f944ee2e9ac1f67c6cf75..56c74ebd55016c28684ed2121666ef77dc6587c8 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>
@@ -683,9 +685,36 @@
</tr>
<tr>
<th>Penguji 1</th>
- <td>{{$sidangTesis->nilai_dosen_penguji_1_utama}}</td>
- <td>{{$sidangTesis->nilai_dosen_penguji_1_penting}}</td>
- <td>{{$sidangTesis->nilai_dosen_penguji_1_pendukung}}</td>
+ @if($sidangTesis->nilai_dosen_penguji_1_utama == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_utama == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_utama == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_penguji_1_penting == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_penting == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_penting == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_penguji_1_pendukung == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_pendukung == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_1_pendukung == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
<td>
<form action="/sidangtesis/nilai/penguji1/reset/{{$user->username}}" method="post">
{{csrf_field()}}
@@ -697,9 +726,36 @@
</tr>
<tr>
<th>Penguji 2</th>
- <td>{{$sidangTesis->nilai_dosen_penguji_2_utama}}</td>
- <td>{{$sidangTesis->nilai_dosen_penguji_2_penting}}</td>
- <td>{{$sidangTesis->nilai_dosen_penguji_2_pendukung}}</td>
+ @if($sidangTesis->nilai_dosen_penguji_2_utama == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_utama == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_utama == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_penguji_2_penting == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_penting == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_penting == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_penguji_2_pendukung == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_pendukung == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_penguji_2_pendukung == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
<td>
<form action="/sidangtesis/nilai/penguji2/reset/{{$user->username}}" method="post">
{{csrf_field()}}
@@ -712,9 +768,36 @@
</tr>
<tr>
<th>Pembimbing</th>
- <td>{{$sidangTesis->nilai_dosen_pembimbing_utama}}</td>
- <td>{{$sidangTesis->nilai_dosen_pembimbing_penting}}</td>
- <td>{{$sidangTesis->nilai_dosen_pembimbing_pendukung}}</td>
+ @if($sidangTesis->nilai_dosen_pembimbing_utama == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_utama == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_utama == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_pembimbing_penting == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_penting == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_penting == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
+ @if($sidangTesis->nilai_dosen_pembimbing_pendukung == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_pendukung == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_pembimbing_pendukung == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
+
<td>
<form action="/sidangtesis/nilai/pembimbing/reset/{{$user->username}}" method="post">
{{csrf_field()}}
@@ -727,7 +810,15 @@
</tr>
<tr>
<th>Dosen Tesis</th>
- <td>{{$sidangTesis->nilai_dosen_kelas_utama}}</td>
+ @if($sidangTesis->nilai_dosen_kelas_utama == 'L')
+ <td>B</td>
+ @elseif($sidangTesis->nilai_dosen_kelas_utama == 'M')
+ <td>C</td>
+ @elseif($sidangTesis->nilai_dosen_kelas_utama == 'K')
+ <td>K</td>
+ @else
+ <td></td>
+ @endif
<td>-</td>
<td>-</td>
<td>
@@ -790,7 +881,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
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index a70137c02d4de3af989bb0607ff2f55b51d6b82f..02afd0fbf506d3dcf9cf01d19357758dfe068b8a 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -25,7 +25,7 @@ class ExampleTest extends TestCase
$response->assertStatus(200);
$username = 'admin';
- $password = 'admin';
+ $password = 'admin123';
Session::start();
$response = $this->followingRedirects()->call('POST', '/login', [
@@ -46,21 +46,21 @@ class ExampleTest extends TestCase
$this->assertEquals(200, $response->getStatusCode());
//register admin
- $response = $this->get('/register');
- $response->assertStatus(200);
-
- $response = $this->followingRedirects()->call('POST', '/register', [
- 'username' => $username,
- 'password' => $password,
- 'password_confirmation' => $password,
- 'phone' => '123456789',
- 'email' => 'akun@palsu.com',
- 'name' => $username,
- 'role' => 'Manajer',
- '_token' => csrf_token()
- ]);
-
- $this->assertEquals(200, $response->getStatusCode());
+// $response = $this->get('/register');
+// $response->assertStatus(200);
+//
+// $response = $this->followingRedirects()->call('POST', '/register', [
+// 'username' => $username,
+// 'password' => $password,
+// 'password_confirmation' => $password,
+// 'phone' => '123456789',
+// 'email' => 'akun@palsu.com',
+// 'name' => $username,
+// 'role' => 'Manajer',
+// '_token' => csrf_token()
+// ]);
+//
+// $this->assertEquals(200, $response->getStatusCode());
$response = $this->followingRedirects()->call('POST', '/logout',[
'_token' => csrf_token()