diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index e403b7dd225af6c43c0460b71f712124ecf412ac..39085603f1b531a535c83032adef45027c32d1d1 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -443,6 +443,31 @@ class SidangTesisController extends Controller
}
+ public function createUlang($id)
+ {
+ $dos =Auth::user()->isDosen();
+ $usr= User::where('username',$id)->first();
+ $mhs = $usr->isMahasiswa();
+ $tesis = $mhs->tesis();
+ $sidang = $tesis->sidangTesis();
+ if($dos && $mhs->tesis()->dosen_pembimbing1 == $dos->id) {
+ $sidang->tanggal = NULL;
+ $sidang->jam = NULL;
+ $sidang->tempat = NULL;
+ $sidang->dosen_penguji_1 = NULL;
+ $sidang->dosen_penguji_2 = NULL;
+ $sidang->ajuan_penguji1 = NULL;
+ $sidang->ajuan_penguji2 = NULL;
+ $sidang->approval_penguji1 = NULL;
+ $sidang->approval_penguji2 = NULL;
+ $sidang->save();
+ return back();
+ } else {
+ return abort(403);
+ }
+
+ }
+
public function dosenEdit(Request $request, $id){
$usr = User::where('username',$id)->first();
// echo $usr;
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index 48b0dd2957942b09c84cb195d76f1de74f80ce67..86ab23ee99129c8699c658218cd0e45a7b5ce647 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -41,26 +41,45 @@
</div>
</div>
<div class="row mt-3 justify-content-center ">
+
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
<fieldset disabled="disabled" class="mb-4">
@endif
+
<a href="/seminartesis/create/{{$mahasiswa->user()->username}}"class="mb-4">
<button class="btn btn-blue">
Buat Pengajuan Seminar Tesis
</button>
</a>
+
</fieldset>
+
@if($mahasiswa->status == \App\Mahasiswa::STATUS_LULUS)
+
<fieldset disabled="disabled">
@endif
+
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
- <a href="/sidangtesis/create/{{$mahasiswa->user()->username}}" class="mb-4">
- <button class="btn btn-blue">
- Buat Pengajuan Sidang Tesis
- </button>
- </a>
+
+ @php($sidang_submitted = App\SidangTesis::where('thesis_id', $tesis->id)->first())
+
+ @if (is_null($sidang_submitted))
+ <a href="/sidangtesis/create/{{$mahasiswa->user()->username}}" class="mb-4">
+ <button class="btn btn-blue">
+ Buat Pengajuan Sidang Tesis
+ </button>
+ </a>
+ @else
+ <a href="/sidangtesis/createUlang/{{$mahasiswa->user()->username}}" class="mb-4">
+ <button class="btn btn-blue">
+ Buat Pengajuan Sidang Tesis Ulang
+ </button>
+ </a>
+ @endif
+
</fieldset>
@endif
+
</div>
</div>
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index d29831f447ea50db4f67a9890b5bd589061ae088..70d9f3f3f9d87a6306ac73bfea4371fffebc6430 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -46,7 +46,7 @@
<div class="col-md-8">
<ul class="nav nav-tabs" role="tablist">
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK and $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK)
+ @if($mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK || $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK && $mahasiswa->status >= \App\Mahasiswa::STATUS_MENUNGGU_TOPIK)
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#topik">Seminar Topik</a>
</li>
@@ -56,7 +56,7 @@
</li>
@endif
- @if(($mahasiswa->status >= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL and $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK) || ($mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL))
+ @if(($mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL || $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL) && ($mahasiswa->status >= \App\Mahasiswa::STATUS_MENUNGGU_PROPOSAL))
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#proposal">Seminar Proposal</a>
</li>
diff --git a/resources/views/manajer/nilai_akhir_mahasiswa.blade.php b/resources/views/manajer/nilai_akhir_mahasiswa.blade.php
index dc31ad7870ad9ba2908b928d22c7953762c15dba..80a8b2397289583f3fe5dcacc1dd5c5d5af0f803 100644
--- a/resources/views/manajer/nilai_akhir_mahasiswa.blade.php
+++ b/resources/views/manajer/nilai_akhir_mahasiswa.blade.php
@@ -35,29 +35,31 @@
</thead>
@foreach($sidang_tesis as $item)
- <tr class="text-center">
- <td>
- {{$loop->iteration}}
- </td>
- <td>
- {{$item->tesis->mahasiswa->user()->username}}
- </td>
- <td>
- {{$item->tesis->mahasiswa->user()->name}}
- </td>
- <td>
- {{$item->nilai}}
- </td>
- <td>
- {{$item->tesis->topic}}
- </td>
- <td>
- {{$item->tesis->dosen_pembimbing_1->user->name}}
- </td>
- <td>
- {{$item->dosen_penguji1->name}}
- </td>
- </tr>
+ @if(!is_null($item->dosen_penguji1))
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->nilai}}
+ </td>
+ <td>
+ {{$item->tesis->topic}}
+ </td>
+ <td>
+ {{$item->tesis->dosen_pembimbing_1->user->name}}
+ </td>
+ <td>
+ {{$item->dosen_penguji1->name}}
+ </td>
+ </tr>
+ @endif
@endforeach
</table>
</div>
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index 3104bbbbbaade9365e86d16205b312bddf5a6a88..0ce964849c3d79d728c61a7572b2510783b90139 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -11,6 +11,12 @@
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#seminar-proposal">Seminar Proposal</a>
</li>
+ <li class="nav-item">
+ <a class="nav-link" data-toggle="tab" href="#seminar-tesis">Seminar Tesis</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" data-toggle="tab" href="#sidang-tesis">Sidang Tesis</a>
+ </li>
</ul>
<div class="tab-content">
<div id="seminar-topik" class="container tab-pane active">
@@ -233,6 +239,109 @@
</div>
</form>
</div>
+
+ <div id="seminar-tesis" class="container tab-pane">
+ <form action="/penjadwalan/seminarproposal" method="post">
+ {{csrf_field()}}
+ <div class="row justify-content-center">
+ </div>
+ <div class="row justify-content-center table-x">
+ <table class="mahasiswa-control-table table table-hover">
+ <thead>
+ <tr class="text-center">
+ <th>
+ No
+ </th>
+ <th>
+ NIM
+ </th>
+ <th>
+ Nama
+ </th>
+ <th>
+ Waktu
+ </th>
+ <th>
+ Tempat
+ </th>
+ <th></th>
+ </tr>
+ </thead>
+ @foreach($seminar_tesis as $item)
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->hari}} {{$item->waktu}}
+ </td>
+ <td>
+ {{$item->tempat}}
+ </td>
+ </tr>
+ @endforeach
+ </table>
+ </div>
+ </form>
+ </div>
+
+ <div id="sidang-tesis" class="container tab-pane">
+ <form action="/penjadwalan/seminarproposal" method="post">
+ {{csrf_field()}}
+ <div class="row justify-content-center">
+ </div>
+ <div class="row justify-content-center table-x">
+ <table class="mahasiswa-control-table table table-hover">
+ <thead>
+ <tr class="text-center">
+ <th>
+ No
+ </th>
+ <th>
+ NIM
+ </th>
+ <th>
+ Nama
+ </th>
+ <th>
+ Waktu
+ </th>
+ <th>
+ Tempat
+ </th>
+ <th></th>
+ </tr>
+ </thead>
+ @foreach($sidang_tesis as $item)
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->tesis->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->tanggal}} {{$item->jam}}
+ </td>
+ <td>
+ {{$item->tempat}}
+ </td>
+ </tr>
+ @endforeach
+ </table>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
</div>
@endsection
diff --git a/routes/web.php b/routes/web.php
index 5f09abfd0cec00212590e661360690899a112c7f..0c8ba7b91ca95216a58edac90647f55d96d75676 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -90,6 +90,7 @@ Route::post('/seminartesis/nilai/{id}', 'SeminarTesisController@nilaiSeminarTesi
Route::get('/sidangtesis/daftar','SidangTesisController@showFormDaftarSidang');
Route::get('/sidangtesis/create/{id}','SidangTesisController@create');
+Route::get('/sidangtesis/createUlang/{id}','SidangTesisController@createUlang');
Route::post('/sidangtesis/dosen/edit/{id}','SidangTesisController@dosenEdit');
Route::post('/sidangtesis/nilai/{id}','SidangTesisController@nilaiSidangTesis');