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 de3bfb9f1c8a6e3e5c662794b2acc285275f1a10..269bbf5a8a38db908d17d370dee5426ba12c8f39 100644
--- a/app/Http/Controllers/DosenController.php
+++ b/app/Http/Controllers/DosenController.php
@@ -33,8 +33,8 @@ class DosenController extends Controller
$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();
-
+ //$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/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index 840190dba5634e94abb04ccafe8de19e39616b84..bed152cfef3cc28ada229da1d2bbbed3d3598866 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -43,7 +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::orderByRaw('updated_at - created_at DESC')->first();
+ $kelas = KelasTesis::where('id_dosen_kelas',$currentUser->id);
if(!$sidangtesis)
return abort(400);
else {
@@ -151,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);
@@ -187,7 +188,7 @@ class SidangTesisController extends Controller
}
$sidangtesis->save();
return back();
- }else if($kelas->id_dosen_kelas == $currentUser->id) {
+ }else if(count($kelas) > 0) {
$scoreutama = $request->get('scoreUtama');
$sidangtesis->nilai_dosen_kelas_utama = $scoreutama;
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/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index e6e84e9eeca712d25f4901f8ae705a96c9b72670..41ed852e6af4c239c5d0822d55546cf10a1fb85f 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -98,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>
@@ -115,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>
@@ -132,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>
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index 3c5227188e3d402a4b9c6951d46e30b89d5646b5..e471bf8da7b97e7511bc38d21b2330e8069f6041 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -43,7 +43,7 @@
<hr/>
<div id="accordion">
- @if($kelas->id_dosen_kelas == $dosen->id)
+ @if(count($kelas) > 0)
<div class="card">
<div class="card-header">
<a class="card-link" data-toggle="collapse" href="#collapseThree">
@@ -73,7 +73,9 @@
</thead>
@foreach($mahasiswakelas as $item)
@php($user = $item->user())
- <tr class="text-center" >
+ @if($item->id_kelas_tesis != null)
+ @if($item->kelasTesis->id_dosen_kelas == $dosen->id)
+ <tr class="text-center" >
<td>
{{$loop->iteration}}
</td>
@@ -128,14 +130,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_kelas_utama == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -163,11 +165,14 @@
</div>
</td>
</tr>
+ @endif
+ @endif
@endforeach
</table>
</div>
</div>
</div>
+ </div>
@endif
@@ -440,14 +445,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_1_utama == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -457,14 +462,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_1_penting == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -474,14 +479,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_1_pendukung == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -507,14 +512,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_2_utama == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -524,14 +529,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_2_penting == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -541,14 +546,14 @@
<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>
+ <option selected ="selected" value="L">B</option>
@elseif ($st->nilai_dosen_penguji_2_pendukung == "M")
- <option selected ="selected" value="M">M</option>
+ <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">L</option>
- <option value="M">M</option>
+ <option value="L">B</option>
+ <option value="M">C</option>
<option value="K">K</option>
@endif
</select>
@@ -560,7 +565,7 @@
</div>
</div>
@endif
-
+
</form>
</fieldset>
@@ -568,7 +573,7 @@
<div class="modal-footer">
<button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
</div>
-
+ </div>
</div>
</div>
</div>
@@ -581,6 +586,151 @@
</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> -->
@@ -589,153 +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
- @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>
@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 9e0e885ebf4e454356437d713fd8ee79a8920dd7..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">
@@ -339,7 +339,7 @@
@endif
</div>
@if(($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK &&
- $mahasiswa->status < \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL) || $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ $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">
@@ -382,7 +382,7 @@
@endif
</div>
- @if(($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL &&
+ @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
@@ -408,7 +408,7 @@
<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">
@@ -418,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 -->