diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index e8990df4fb9836c80a2f07ae17ea9172a6c3257a..9897320c8097e769ee5bc4db40492adc3db84449 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -87,7 +87,19 @@ class RegisterController extends Controller
if(User::where('username',$username)->count()>0) {
echo '<div class="alert alert-warning alert-dismissible fade show text-center">
<button type="button" class="close" data-dismiss="alert">×</button>
- <strong>Warning!</strong> This user already exist.
+ This user <strong>already exist.</strong>
+ </div>';
+ return view('auth.register');
+ } else if(strlen($data['username']) > 18){
+ echo '<div class="alert alert-warning alert-dismissible fade show text-center">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <strong>Username</strong> too long (maximum size: 18 characters).
+ </div>';
+ return view('auth.register');
+ } else if(strlen($data['phone']) > 18){
+ echo '<div class="alert alert-warning alert-dismissible fade show text-center">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <strong>Invalid</strong> phone number.
</div>';
return view('auth.register');
} else {
@@ -101,7 +113,11 @@ class RegisterController extends Controller
} else if($role == User::ROLE_MANAJER) {
Manajer::create(['id'=>$user->id]);
}
- return view('manajer.index');
+ echo '<div class="alert alert-success alert-dismissible fade show text-center">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <strong>Success !</strong> New user has successfully registered!
+ </div>';
+ return view('auth.register');
}
// echo $id;
diff --git a/app/Http/Controllers/HasilBimbinganController.php b/app/Http/Controllers/HasilBimbinganController.php
index cc8713db1f3456297eaf7b6c48b66c87dc41943d..3b4bdae115e381c2bb9e4da57a188b4507608c32 100644
--- a/app/Http/Controllers/HasilBimbinganController.php
+++ b/app/Http/Controllers/HasilBimbinganController.php
@@ -194,7 +194,7 @@ class HasilBimbinganController extends Controller
'hasil_dan_diskusi' => 'required|string',
'rencana_tindak_lanjut' => 'required|string',
'dosen_id2' => 'nullable|integer',
- 'waktu_bimbingan_selanjutnya' => 'required|date'
+ 'waktu_bimbingan_selanjutnya' => 'nullable|date'
]);
}
diff --git a/app/Http/Controllers/KelasTesisController.php b/app/Http/Controllers/KelasTesisController.php
index 6ac9f2d4c05d8b0fb6fc1592cd259a74332b2351..b8a9b6722bcc40dc212e3bdaae4970f9706cf95c 100644
--- a/app/Http/Controllers/KelasTesisController.php
+++ b/app/Http/Controllers/KelasTesisController.php
@@ -20,7 +20,7 @@ class KelasTesisController extends Controller
public function showKelasTesis() {
$manajer = Auth::user()->isManajer();
if($manajer) {
- $kelas_tesis = KelasTesis::get();
+ $kelas_tesis = KelasTesis::orderBy('created_at','desc')->get();
$dosen = Dosen::get();
return view('manajer.kelas_tesis',['kelas_tesis' => $kelas_tesis, 'dosen' => $dosen]);
} else {
@@ -39,9 +39,22 @@ class KelasTesisController extends Controller
echo json_encode($validator->errors());
} else {
$ok_count++;
-
+ $tahun = null;
+ if(idate("m") > 6){
+ if($data['semester'] == 1){
+ $tahun = idate("Y");
+ }else{
+ $tahun = idate("Y")+1;
+ }
+ }else{
+ if($data['semester'] == 1){
+ $tahun = idate("Y")-1;
+ }else{
+ $tahun = idate("Y");
+ }
+ }
$kelas_tesis = KelasTesis::create([
- 'tahun' => $data['tahun'],
+ 'tahun' => $tahun,
'semester' => $data['semester'],
'id_dosen_kelas' => $data['dosen_id']
]);
diff --git a/app/Http/Controllers/MahasiswaController.php b/app/Http/Controllers/MahasiswaController.php
index 2347432da6d30c347aac08ba32b5528e8a0c962e..578e6f7f97e86cdc1588eda1337682d407508ede 100644
--- a/app/Http/Controllers/MahasiswaController.php
+++ b/app/Http/Controllers/MahasiswaController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Mahasiswa;
+use App\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class MahasiswaController extends Controller
@@ -72,7 +73,9 @@ class MahasiswaController extends Controller
$usr = Mahasiswa::find($id);
$usr->status = $request->get('status');
$usr->save();
- return back();
+
+ $user = User::where('username',$usr->user()->username)->first();
+ return view('edit_user',['user'=>$user,'success_status'=>true]);
} else {
return abort(403);
}
diff --git a/app/Http/Controllers/ManajerController.php b/app/Http/Controllers/ManajerController.php
index e370fe5d53be4d3372a7cb8df22ef630995579de..f9a6aa6bc827c68a8aba3d1ee0553495eebea68e 100644
--- a/app/Http/Controllers/ManajerController.php
+++ b/app/Http/Controllers/ManajerController.php
@@ -46,17 +46,6 @@ class ManajerController extends Controller
if($this->getManajer()) {
$user = User::where('username', $username)->get()->first();
$mahasiswa = $user->isMahasiswa();
- if($mahasiswa->tesis()){
- $tesis=$mahasiswa->tesis();
- if($tesis->sidangTesis()){
- if(!is_null($tesis->sidangTesis()->nilai)) {
- if ($tesis->sidangTesis()->nilai != "E") {
- $mahasiswa->status = Mahasiswa::STATUS_LULUS;
- $mahasiswa->save();
- }
- }
- }
- }
if ($mahasiswa) {
return view('manajer.detail_mahasiswa_control',
diff --git a/app/Http/Controllers/PenjadwalanController.php b/app/Http/Controllers/PenjadwalanController.php
index d16ff3456984ebb586b5804895e601fa3db0f70e..b713cf6eca46e278b964bf2bbe9c125c38a0886b 100644
--- a/app/Http/Controllers/PenjadwalanController.php
+++ b/app/Http/Controllers/PenjadwalanController.php
@@ -25,7 +25,7 @@ class PenjadwalanController extends Controller
public function showPenjadwalanPage(){
$manajer = Auth::user()->isManajer();
if($manajer) {
- $seminar_topik = SeminarTopik::get();
+ $seminar_topik = SeminarTopik::orderBy('topik_id','asc')->orderBy('created_at','desc')->get();
$topik = TopicApproval::where('action',1)->whereNotIn('topic_id', function($q){
$q->select('topik_id')->from('seminar_topiks');
})->get();
@@ -38,7 +38,7 @@ class PenjadwalanController extends Controller
// })->get();
//error_log(count($proposal));
- $seminar_proposal = SeminarProposal::get();
+ $seminar_proposal = SeminarProposal::orderBy('proposal_id','asc')->orderBy('created_at','desc')->get();
$seminar_tesis = SeminarTesis::get();
$sidang_tesis = SidangTesis::get();
@@ -77,6 +77,7 @@ class PenjadwalanController extends Controller
]
);
$mahasiswa->status = Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK;
+ $mahasiswa->t_topik3 = date("Y-m-d H:i:s");
$mahasiswa->save();
}
$status = 1;
@@ -99,12 +100,21 @@ class PenjadwalanController extends Controller
$id = 0;
$status = 0;
$proposal_id = 0;
+ $dosbing1 = -1;
+ $dosbing2 = -1;
+ $dosen_penguji = -1;
foreach ($data as $key => $value){
if(substr($key,0,2) === 'id') {
$id = $value;
- }else if(substr($key,0,2) === 'tp' && substr($key,2) === $id){
+ }else if(substr($key,0,2) === 'tp' && substr($key,2) === $id) {
$proposal_id = $value;
error_log($proposal_id);
+ }else if(substr($key,0,2) === 'pa' && substr($key,2) === $id){
+ $dosbing1 = $value;
+ }else if(substr($key,0,2) === 'pb' && substr($key,2) === $id){
+ $dosbing2 = $value;
+ }else if(substr($key,0,2) === 'pg' && substr($key,2) === $id){
+ $dosen_penguji = $value;
}else if(substr($key,0,3) === 'sch') {
if ($id === substr($key, 3)) {
$mahasiswa = Mahasiswa::find($id);
@@ -113,10 +123,14 @@ class PenjadwalanController extends Controller
"mahasiswa_id" => $id,
"schedule" => $request->get($key),
"creator_id" => $manajer->id,
- "proposal_id" => $proposal_id
+ "proposal_id" => $proposal_id,
+ "id_dosen_pembimbing_1" => $dosbing1,
+ "id_dosen_pembimbing_2" => $dosbing2,
+ "id_dosen_penguji" => $dosen_penguji
]
);
$mahasiswa->status = Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL;
+ $mahasiswa->t_proposal3 = date("Y-m-d H:i:s");
$mahasiswa->save();
}
$status = 1;
diff --git a/app/Http/Controllers/ProposalController.php b/app/Http/Controllers/ProposalController.php
index ec6e260d805f8cc7ccd0e05ee5e23ff5413ca0a7..573029266fc29926ab02f50e3d78a0962884d6c4 100644
--- a/app/Http/Controllers/ProposalController.php
+++ b/app/Http/Controllers/ProposalController.php
@@ -31,6 +31,7 @@ class ProposalController extends Controller
"path" => $path
]);
$mhs->status = Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN;
+ $mhs->t_proposal1 = date("Y-m-d H:i:s");
$mhs->save();
return redirect("/");
} else {
@@ -65,6 +66,7 @@ class ProposalController extends Controller
if($mnj_action == Proposal::ACTION_PROPOSAL_DITERIMA) {
$prop_obj->status = Proposal::STATUS_PROPOSAL_DITERIMA;
$mhs_obj->status = Mahasiswa::STATUS_PROPOSAL_DITERIMA;
+ $mhs_obj->t_proposal2 = date("Y-m-d H:i:s");
}
else if ($mnj_action == Proposal::ACTION_PROPOSAL_DITOLAK) {
$prop_obj->status = Proposal::STATUS_PROPOSAL_DITOLAK;
diff --git a/app/Http/Controllers/RekapDataController.php b/app/Http/Controllers/RekapDataController.php
index 3b19fa08ca0cf28ad9af4f80df124def98a23a2b..ca7a40e5ef8748786f85ea32f9c3c5eb89531b5b 100644
--- a/app/Http/Controllers/RekapDataController.php
+++ b/app/Http/Controllers/RekapDataController.php
@@ -18,7 +18,12 @@ class RekapDataController extends Controller
public function showRekapMahasiswa(){
$manajer = Auth::user()->isManajer();
if($manajer){
- $mahasiswa = Mahasiswa::get();
+ $mahasiswa = Mahasiswa::join('users','users.id','=','mahasiswas.id')
+ ->select('users.username','mahasiswas.*')
+ ->where('mahasiswas.status', '!=', Mahasiswa::STATUS_NOT_ACTIVE)
+ ->where('mahasiswas.status', '!=', Mahasiswa::STATUS_LULUS)
+ ->orderBy('users.username','asc')
+ ->get();
return view('manajer.rekap_data_mahasiswa',['mahasiswa' => $mahasiswa]);
}else{
return abort(303);
@@ -35,4 +40,20 @@ class RekapDataController extends Controller
return abort(303);
}
}
+
+ public function showHistoryMahasiswa(){
+ $manajer = Auth::user()->isManajer();
+ if($manajer) {
+ $mahasiswa = Mahasiswa::join('users','users.id','=','mahasiswas.id')
+ ->select('users.username','mahasiswas.*')
+ ->where('mahasiswas.status', '=', Mahasiswa::STATUS_NOT_ACTIVE)
+ ->orWhere('mahasiswas.status', '=', Mahasiswa::STATUS_LULUS)
+ ->orderBy('mahasiswas.status','desc')
+ ->orderBy('users.username','asc')
+ ->get();
+ return view('manajer.mahasiswa_history_control', ['mahasiswa' => $mahasiswa]);
+ } else {
+ abort(403);
+ }
+ }
}
\ No newline at end of file
diff --git a/app/Http/Controllers/SeminarProposalController.php b/app/Http/Controllers/SeminarProposalController.php
index 1b9c7fdd06ad7fb94fd6559a81a02b22108d6ce8..4e4ee15c02bd83db2b61f312c94db3d1d1d13924 100644
--- a/app/Http/Controllers/SeminarProposalController.php
+++ b/app/Http/Controllers/SeminarProposalController.php
@@ -21,10 +21,15 @@ class SeminarProposalController extends Controller
"mahasiswa_id" => $mhs_id,
"schedule" => $request->get("date"),
"creator_id" => $manajer->id,
- "proposal_id" => $mahasiswa->proposal()->id
+ "proposal_id" => $mahasiswa->proposal()->id,
+ "id_dosen_pembimbing_1" => $request->get('dosen_pembimbing_1'),
+ "id_dosen_pembimbing_2" => $request->get('dosen_pembimbing_2'),
+ "id_dosen_penguji" => $request->get('dosen_penguji')
+
]
);
$mahasiswa->status = Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL;
+ $mahasiswa->t_proposal3 = date("Y-m-d H:i:s");
$mahasiswa->save();
return redirect('/mahasiswa/control/'.$mahasiswa->user()->username);
} else {
@@ -41,14 +46,16 @@ class SeminarProposalController extends Controller
if($manajer) {
$mahasiswa_id = $request->get('mahasiswa');
$mhs = Mahasiswa::find($mahasiswa_id);
-
$score = $request->get('score');
$sp = $mhs->seminarProposal();
+ $sp->mark_dosen_pembimbing = $request->get('mark_dosen_pembimbing');
+ $sp->mark_dosen_penguji = $request->get('mark_dosen_penguji');
$sp->passed = $score!='D' && $score != 'E';
$sp->evaluator_id = $manajer->id;
$sp->score = $score;
if($sp->passed) {
$mhs->status = Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL;
+ $mhs->t_proposal4 = date("Y-m-d H:i:s");
} else {
$mhs->status = Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL;
}
diff --git a/app/Http/Controllers/SeminarTesisController.php b/app/Http/Controllers/SeminarTesisController.php
index 8f2f080d56031a9c1f056678c0ae84243eb77ea5..a2339fc6da746a656800079c452bfe5aae2cfec6 100644
--- a/app/Http/Controllers/SeminarTesisController.php
+++ b/app/Http/Controllers/SeminarTesisController.php
@@ -35,11 +35,12 @@ class SeminarTesisController extends Controller
public function createRequestPenjadwalan(Request $request, $id) {
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
- if(!$usr || !$mhs || !$mhs->tesis()) {
+ $tesis = $mhs->tesis();
+ if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
- $db1 = $mhs->tesis()->dosen_pembimbing1 == Auth::user()->id;
- $db2 = $mhs->tesis()->dosen_pembimbing2 == Auth::user()->id;
+ $db1 = $tesis->dosen_pembimbing1 == Auth::user()->id;
+ $db2 = $tesis->dosen_pembimbing2 == Auth::user()->id;
if ($db1 || $db2) {
$name = $request->get('name');
$nim = $request->get('nim');
@@ -56,8 +57,11 @@ class SeminarTesisController extends Controller
'approval_pembimbing1' => $db1,
'approval_pembimbing2' => $db2,
]);
+ $tesis->judul_thesis = $judul;
$mhs->status = Mahasiswa::STATUS_SIAP_SEMINAR_TESIS;
+ $mhs->t_seminar1 = date("Y-m-d H:i:s");
$mhs->save();
+ $tesis->save();
return redirect('/dosen/mahasiswa-control/'.$id);
} else {
return abort(403);
@@ -68,12 +72,13 @@ class SeminarTesisController extends Controller
public function editPenjadwalan(Request $request, $id) {
$usr = User::where('username',$id)->first();
$mhs = $usr->isMahasiswa();
- if(!$usr || !$mhs || !$mhs->tesis()) {
+ $tesis = $mhs->tesis();
+ if(!$usr || !$mhs || !$tesis) {
return abort(400);
} else {
- $db1 = $mhs->tesis()->dosen_pembimbing1 == Auth::user()->id;
- $db2 = $mhs->tesis()->dosen_pembimbing2 == Auth::user()->id;
- $st = $mhs->tesis()->seminarTesis();
+ $db1 = $tesis->dosen_pembimbing1 == Auth::user()->id;
+ $db2 = $tesis->dosen_pembimbing2 == Auth::user()->id;
+ $st = $tesis->seminarTesis();
if ($db1 || $db2 || Auth::user()->isManajer()) {
echo json_encode($request->all());
if($request->get('approval_db2') && $db2) {
@@ -85,6 +90,9 @@ class SeminarTesisController extends Controller
$st->waktu = $request->get('waktu');
$st->hari = $request->get('haritgl');
$st->tempat = $request->get('tempat');
+ $judul = $request->get('judul');
+ $tesis->judul_thesis = $judul;
+ $tesis->save();
$st->save();
// echo json_encode($st);
if(Auth::user()->isManajer()) {
@@ -128,6 +136,7 @@ class SeminarTesisController extends Controller
$st->save();
if($action == 1) {
$mhs->status = Mahasiswa::STATUS_LULUS_SEMINAR_TESIS;
+ $mhs->t_seminar2 = date("Y-m-d H:i:s");
} else {
$mhs->status = Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS;
diff --git a/app/Http/Controllers/SeminarTopikController.php b/app/Http/Controllers/SeminarTopikController.php
index 3f6cab91a1658b14c0609c052871f43ade969a67..54860692e101c72eae5915383d147bd9d0774484 100644
--- a/app/Http/Controllers/SeminarTopikController.php
+++ b/app/Http/Controllers/SeminarTopikController.php
@@ -23,6 +23,7 @@ class SeminarTopikController extends Controller
]
);
$mahasiswa->status = Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK;
+ $mahasiswa->t_topik3 = date("Y-m-d H:i:s");
$mahasiswa->save();
return redirect('/mahasiswa/control/'.$mahasiswa->user()->username);
} else {
@@ -47,6 +48,7 @@ class SeminarTopikController extends Controller
$st->evaluator_id = $manajer->id;
if($action) {
$mhs->status = Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK;
+ $mhs->t_topik4 = date("Y-m-d H:i:s");
} else {
$mhs->status = Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK;
diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index bed152cfef3cc28ada229da1d2bbbed3d3598866..e403b7dd225af6c43c0460b71f712124ecf412ac 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -48,7 +48,7 @@ class SidangTesisController extends Controller
if(!$sidangtesis)
return abort(400);
else {
- if($tesis->dosen_pembimbing1 == $currentUser->id) {
+ if($tesis->dosen_pembimbing1 == $currentUser->id || $request->get('roledosen') == "pembimbing") {
$scoreutama = $request->get('scoreUtama');
$scorepenting = $request->get('scorePenting');
$scorependukung = $request->get('scorePendukung');
@@ -96,7 +96,7 @@ class SidangTesisController extends Controller
}
$sidangtesis->save();
return back();
- } else if($sidangtesis->dosen_penguji_1 == $currentUser->id) {
+ } else if($sidangtesis->dosen_penguji_1 == $currentUser->id || $request->get('roledosen') == "penguji1") {
$scoreutama = $request->get('scoreUtama');
$scorepenting = $request->get('scorePenting');
$scorependukung = $request->get('scorePendukung');
@@ -142,7 +142,7 @@ class SidangTesisController extends Controller
}
$sidangtesis->save();
return back();
- } else if($sidangtesis->dosen_penguji_2 == $currentUser->id) {
+ } else if($sidangtesis->dosen_penguji_2 == $currentUser->id || $request->get('roledosen') == "penguji2") {
$scoreutama = $request->get('scoreUtama');
$scorepenting = $request->get('scorePenting');
$scorependukung = $request->get('scorePendukung');
@@ -188,7 +188,7 @@ class SidangTesisController extends Controller
}
$sidangtesis->save();
return back();
- }else if(count($kelas) > 0) {
+ }else if($request->get('roledosen') == "kelas" || count($kelas) > 0) {
$scoreutama = $request->get('scoreUtama');
$sidangtesis->nilai_dosen_kelas_utama = $scoreutama;
@@ -231,6 +231,15 @@ class SidangTesisController extends Controller
}
}
$sidangtesis->save();
+
+ if(!is_null($tesis->sidangTesis()->nilai)) {
+ if ($tesis->sidangTesis()->nilai != "E") {
+ $mhs->status = Mahasiswa::STATUS_LULUS;
+ $mhs->t_lulus = date("Y-m-d H:i:s");
+ $mhs->save();
+ }
+ }
+
return back();
} else {
return abort(403);
@@ -257,6 +266,7 @@ class SidangTesisController extends Controller
$sidangtesis->nilai_dosen_penguji_1_utama = NULL;
$sidangtesis->nilai_dosen_penguji_1_penting = NULL;
$sidangtesis->nilai_dosen_penguji_1_pendukung = NULL;
+ $sidangtesis->nilai = NULL;
$sidangtesis->save();
return back();
}
@@ -281,6 +291,7 @@ class SidangTesisController extends Controller
$sidangtesis->nilai_dosen_penguji_2_utama = NULL;
$sidangtesis->nilai_dosen_penguji_2_penting = NULL;
$sidangtesis->nilai_dosen_penguji_2_pendukung = NULL;
+ $sidangtesis->nilai = NULL;
$sidangtesis->save();
return back();
}
@@ -305,6 +316,30 @@ class SidangTesisController extends Controller
$sidangtesis->nilai_dosen_pembimbing_utama = NULL;
$sidangtesis->nilai_dosen_pembimbing_penting = NULL;
$sidangtesis->nilai_dosen_pembimbing_pendukung = NULL;
+ $sidangtesis->nilai = NULL;
+ $sidangtesis->save();
+ return back();
+ }
+ }
+
+ public function resetNilaiKelas(Request $request, $id) {
+ $manajer = Auth::User()->isManajer();
+ $usr = User::where('username',$id)->first();
+ echo $usr;
+ if (!$manajer)
+ return abort(400);
+ $mhs = $usr->isMahasiswa();
+ if(!$mhs)
+ return abort(400);
+ $tesis = $mhs->tesis();
+ if(!$tesis)
+ return abort(400);
+ $sidangtesis = $tesis->sidangTesis();
+ if(!$sidangtesis)
+ return abort(400);
+ else {
+ $sidangtesis->nilai_dosen_kelas_utama = NULL;
+ $sidangtesis->nilai = NULL;
$sidangtesis->save();
return back();
}
@@ -419,12 +454,12 @@ class SidangTesisController extends Controller
$sidang->tanggal = $request->get('haritgl');
$sidang->jam = $request->get('waktu');
$sidang->tempat = $request->get('tempat');
+ $tesis->judul_thesis = $request->get('judul');
$sidang->ajuan_penguji1 = $request->get('usulan_penguji1');
$sidang->ajuan_penguji2 = $request->get('usulan_penguji2');
- $sidang->ajuan_penguji3 = $request->get('usulan_penguji3');
$sidang->approval_penguji1 = false;
$sidang->approval_penguji2 = false;
- $sidang->approval_penguji3 = false;
+ $tesis->save();
$sidang->save();
return back();
} else{
@@ -564,9 +599,12 @@ class SidangTesisController extends Controller
$sidang->jam = $request->get('waktu');
$sidang->tempat = $request->get('tempat');
$sidang->dosen_penguji_1 = $request->get('dosen_penguji1');
- $sidang->dosen_penguji_2 = $request->get('dosen_penguji2');
+ $sidang->dosen_penguji_2 = $request->get('dosen_penguji2');
+ $tesis->judul_thesis = $request->get('judul');
+ $tesis->save();
$sidang->save();
$mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS;
+ $mhs->t_sidang = date("Y-m-d H:i:s");
$mhs->save();
return back();
} else{
diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php
index d3e086e4f00bb67c264e2f4546d3cd2e465eae7e..58f613b747c64984232b2fc4c11d07f05406d224 100644
--- a/app/Http/Controllers/TopicController.php
+++ b/app/Http/Controllers/TopicController.php
@@ -81,6 +81,7 @@ class TopicController extends Controller
return abort(400);
} else {
$mahasiswa->status = Mahasiswa::STATUS_TOPIK_TELAH_DIAJUKAN;
+ $mahasiswa->t_topik1 = date("Y-m-d H:i:s");
$mahasiswa->save();
return redirect('/dashboard/mahasiswa');
}
@@ -131,7 +132,8 @@ class TopicController extends Controller
);
$mhs->status = Mahasiswa::STATUS_TOPIK_DITERIMA;
- $mhs->save();
+ $mhs->t_topik2 = date("Y-m-d H:i:s");
+ $mhs->save();
}
return redirect('/mahasiswa/control/'.$uname);
diff --git a/app/SeminarProposal.php b/app/SeminarProposal.php
index 5c0eb98184cdc0caa4fba54f2585872815f14535..312c8e15c9c84e4f2672b2f9c851979e4317c119 100644
--- a/app/SeminarProposal.php
+++ b/app/SeminarProposal.php
@@ -8,18 +8,35 @@ class SeminarProposal extends Model
const ACTION_LULUS = 1;
const ACTION_GAGAL = 0;
protected $fillable = [
- "mahasiswa_id","schedule","creator_id","passed","evaluator_id","proposal_id"
+ "mahasiswa_id", "schedule", "creator_id", "passed", "evaluator_id", "proposal_id", "id_dosen_penguji", "id_dosen_pembimbing_1",
+ "id_dosen_pembimbing_2", "mark_dosen_pembimbing", "mark_dosen_penguji"
];
- public function creator() {
- return $this->belongsTo('App\User','creator_id','id');
+ public function creator()
+ {
+ return $this->belongsTo('App\User', 'creator_id', 'id');
}
- public function evaluator() {
- return $this->belongsTo('App\User','evaluator_id','id');
+ public function evaluator()
+ {
+ return $this->belongsTo('App\User', 'evaluator_id', 'id');
}
- public function mahasiswa() {
- return $this->belongsTo('App\Mahasiswa','mahasiswa_id','id');
+ public function mahasiswa()
+ {
+ return $this->belongsTo('App\Mahasiswa', 'mahasiswa_id', 'id');
+ }
+
+ public function dosen_pembimbing_1()
+ {
+ return $this->belongsTo('App\Dosen','id_dosen_pembimbing_1','id');
+ }
+ public function dosen_pembimbing_2()
+ {
+ return $this->belongsTo('App\Dosen','id_dosen_pembimbing_2','id');
+ }
+ public function dosen_penguji()
+ {
+ return $this->belongsTo('App\Dosen','id_dosen_penguji','id');
}
}
diff --git a/app/Thesis.php b/app/Thesis.php
index cf3fe404d5512ad904cef6ecfded27be6b47a1bf..72f8d8f15f58e35accfbf4fe2655753cf5163a88 100644
--- a/app/Thesis.php
+++ b/app/Thesis.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class Thesis extends Model
{
public $table = "thesis";
- protected $fillable= ['id','dosen_pembimbing1','dosen_pembimbing2','mahasiswa_id','topic','keilmuan','creator','opsi'];
+ protected $fillable= ['id','dosen_pembimbing1','dosen_pembimbing2','mahasiswa_id','topic','keilmuan','creator','opsi','judul_thesis'];
public function dosen_pembimbing_1() {
return $this->belongsTo('App\Dosen', 'dosen_pembimbing1', 'id');
diff --git a/database/migrations/2018_05_09_122800_add_progress_date_columns.php b/database/migrations/2018_05_09_122800_add_progress_date_columns.php
new file mode 100644
index 0000000000000000000000000000000000000000..09c2c1284f774931c40488582b6b2c0a46ea2611
--- /dev/null
+++ b/database/migrations/2018_05_09_122800_add_progress_date_columns.php
@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddProgressDateColumns extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('mahasiswas', function (Blueprint $table) {
+ $table->timestamp('t_topik1')->nullable();
+ $table->timestamp('t_topik2')->nullable();
+ $table->timestamp('t_topik3')->nullable();
+ $table->timestamp('t_topik4')->nullable();
+ $table->timestamp('t_proposal1')->nullable();
+ $table->timestamp('t_proposal2')->nullable();
+ $table->timestamp('t_proposal3')->nullable();
+ $table->timestamp('t_proposal4')->nullable();
+ $table->timestamp('t_seminar1')->nullable();
+ $table->timestamp('t_seminar2')->nullable();
+ $table->timestamp('t_sidang')->nullable();
+ $table->timestamp('t_lulus')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('mahasiswas', function (Blueprint $table) {
+ $table->dropColumn('t_topik1');
+ $table->dropColumn('t_topik2');
+ $table->dropColumn('t_topik3');
+ $table->dropColumn('t_topik4');
+ $table->dropColumn('t_proposal1');
+ $table->dropColumn('t_proposal2');
+ $table->dropColumn('t_proposal3');
+ $table->dropColumn('t_proposal4');
+ $table->dropColumn('t_seminar1');
+ $table->dropColumn('t_seminar2');
+ $table->dropColumn('t_sidang');
+ $table->dropColumn('t_lulus');
+ });
+ }
+}
diff --git a/database/migrations/2018_05_09_165059_add_judul_thesis_to_thesis_table.php b/database/migrations/2018_05_09_165059_add_judul_thesis_to_thesis_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..1598c48618b81263ca641f650a24b002ad516d90
--- /dev/null
+++ b/database/migrations/2018_05_09_165059_add_judul_thesis_to_thesis_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddJudulThesisToThesisTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('thesis', function (Blueprint $table) {
+ $table->string('judul_thesis')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('thesis', function (Blueprint $table) {
+ $table->dropColumn('judul_thesis');
+ });
+ }
+}
diff --git a/database/migrations/2018_05_10_142055_add_dosen_penguji_pembimbing.php b/database/migrations/2018_05_10_142055_add_dosen_penguji_pembimbing.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7774f2fbe7ad13658f4e322fa2863a369120838
--- /dev/null
+++ b/database/migrations/2018_05_10_142055_add_dosen_penguji_pembimbing.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDosenPengujiPembimbing extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('seminar_proposals', function (Blueprint $table) {
+ //
+ $table->integer('id_dosen_pembimbing_1')->nullable();
+ $table->integer('id_dosen_pembimbing_2')->nullable();
+ $table->integer('id_dosen_penguji')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('seminar_proposals', function (Blueprint $table) {
+ //
+ $table->dropColumn('id_dosen_pembimbing_1');
+ $table->dropColumn('id_dosen_pembimbing_2');
+ $table->dropColumn('id_dosen_penguji');
+
+ });
+ }
+}
diff --git a/database/migrations/2018_05_10_150656_add_dosen_score.php b/database/migrations/2018_05_10_150656_add_dosen_score.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5cadccbe920d7db03963e5aab60d085d50e9994
--- /dev/null
+++ b/database/migrations/2018_05_10_150656_add_dosen_score.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDosenScore extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('seminar_proposals', function (Blueprint $table) {
+ //
+ $table->char('mark_dosen_pembimbing')->nullable();
+ $table->char('mark_dosen_penguji')->nullable();
+
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('seminar_proposals', function (Blueprint $table) {
+ //
+ $table->dropColumn('mark_dosen_pembimbing');
+ $table->dropColumn('mark_dosen_penguji');
+ });
+ }
+}
diff --git a/resources/assets/sass/component/rekap.scss b/resources/assets/sass/component/rekap.scss
index d24d376ec489a19d754c48e9047b1caef7c26814..80c6658adce7f1f2ac10082f281f31763f6fccd7 100644
--- a/resources/assets/sass/component/rekap.scss
+++ b/resources/assets/sass/component/rekap.scss
@@ -7,8 +7,9 @@
width: 700px;
}
-.rekap-table{
- width: 1100px;
+.rekap-table {
+ margin-top: 20px;
+ width: 1400px;
}
.dummy{
@@ -21,10 +22,42 @@
width: 500px;
}
-.done{
- background-color: #00bbe8;
+.done-rekap{
+ background-color: #2ec866;
}
.doing{
background-color: #b8b8b8;
+}
+
+.advancer-btn{
+ margin-left: 10px;
+ height: 30px;
+ width: 30px;
+}
+
+.btns{
+ margin-left: 900px;
+ width: 150px;
+}
+
+@media only screen and (max-width: 1200px){
+ .btns{
+ margin-left: 820px;
+ width: 150px;
+ }
+}
+
+@media only screen and (max-width: 990px){
+ .btns{
+ margin-left: 650px;
+ width: 150px;
+ }
+}
+
+@media only screen and (max-width: 770px){
+ .btns{
+ margin-left: 310px;
+ width: 150px;
+ }
}
\ No newline at end of file
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 48f87ae0cedb4ef221cb75843c22f3189f34281f..bcc6f7ec4438e5ab13d62c96c3f86b5db5242288 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -26,7 +26,7 @@
</div>
<div class="form-group row">
- <label for="username" class="col-md-4 col-form-label text-md-right">Username</label>
+ <label for="username" class="col-md-4 col-form-label text-md-right">Username (NIM/NIP)</label>
<div class="col-md-6">
<input id="username" type="username" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" name="username" value="{{ old('username') }}" required>
@@ -43,7 +43,7 @@
<label for="email" class="col-md-4 col-form-label text-md-right">E-Mail Address</label>
<div class="col-md-6">
- <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
+ <input id="email" type="email" pattern="^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
@if ($errors->has('email'))
<span class="invalid-feedback">
@@ -57,7 +57,7 @@
<label for="phone" class="col-md-4 col-form-label text-md-right">Phone Number</label>
<div class="col-md-6">
- <input id="phone" type="phone" class="form-control{{ $errors->has('phone') ? ' is-invalid' : '' }}" name="phone" value="{{ old('phone') }}" >
+ <input id="phone" type="phone" pattern="^[+]?[0-9][0-9]([-]?\s?)[0-9](\s?\d?[-]?)*$" class="form-control{{ $errors->has('phone') ? ' is-invalid' : '' }}" name="phone" value="{{ old('phone') }}" >
</div>
</div>
diff --git a/resources/views/dosen/create_seminartesis.blade.php b/resources/views/dosen/create_seminartesis.blade.php
index ca17e267493ecdc34729270700a7360824c9073c..5e0e8244b8694b23d83d580b04dfe16b3274f3a5 100644
--- a/resources/views/dosen/create_seminartesis.blade.php
+++ b/resources/views/dosen/create_seminartesis.blade.php
@@ -22,7 +22,7 @@
</div>
<div class="form-group row col-md-12">
<label for="judul" class="col-md-4 col-form-label text-md-right text-center ">Judul Tesis<sup>*</sup></label>
- <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->topic}}" required disabled>
+ <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->judul_thesis}}">
</div>
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index 41ed852e6af4c239c5d0822d55546cf10a1fb85f..48b0dd2957942b09c84cb195d76f1de74f80ce67 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -180,7 +180,7 @@
<div class="form-group row col-md-12">
<label for="judul" class="col-md-4 col-form-label text-md-right text-center ">Judul Tesis<sup>*</sup></label>
- <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->topic}}" required disabled>
+ <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->judul_thesis}}">
</div>
@@ -211,6 +211,7 @@
Usulan Dosen Penguji
</label>
<select name="usulan_penguji1" class="form-control col-md-8" id="">
+ <option></option>
@foreach(App\Dosen::getListDosenPenguji() as $item)
<option value="{{$item->id}}"
@if($sidangTesis->ajuan_penguji1 == $item->id)
@@ -229,6 +230,7 @@
Usulan Dosen Penguji
</label>
<select name="usulan_penguji2" class="form-control col-md-8" id="">
+ <option></option>
@foreach(App\Dosen::getListDosenPenguji() as $item)
<option value="{{$item->id}}"
@if($sidangTesis->ajuan_penguji2 == $item->id)
@@ -240,24 +242,6 @@
@endforeach
</select>
</div>
- <div class="form-group row col-md-12">
-
- <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
- Usulan Dosen Penguji
- </label>
- <select name="usulan_penguji3" class="form-control col-md-8" id="">
- @foreach(App\Dosen::getListDosenPenguji() as $item)
- <option value="{{$item->id}}"
- @if($sidangTesis->ajuan_penguji3 == $item->id)
- selected
- @endif
- >
- {{$item->user->name}}
- </option>
- @endforeach
- </select>
- </div>
-
</div>
<div class="row justify-content-center">
@@ -328,6 +312,14 @@
<div>
<form action="/seminartesis/edit/{{$user->username}}" method="post">
{{csrf_field()}}
+
+ <div class="form-group row col-md-12">
+ <label for="judul" class="col-md-4 col-form-label text-md-right text-center">
+ Judul Tesis
+ </label>
+ <input id="judul" name="judul" class="col-md-8 form-control" value="{{$tesis->judul_thesis}}" >
+ </div>
+
<div class="form-group row col-md-12">
<label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
Tanggal
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index e471bf8da7b97e7511bc38d21b2330e8069f6041..d499bb78d7841d3205765d03b5bf1d38d7e99649 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -601,26 +601,28 @@
@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>
+ @if($item->gethasilBimbingan()[0]->waktu_bimbingan_selanjutnya != null)
+ @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>
- </div>
+ @endif
@endif
@endif
@if(!is_null($item->tesis()))
diff --git a/resources/views/edit_user.blade.php b/resources/views/edit_user.blade.php
index bb464c93742ba578330304a6aba8efc60d27438a..1fb072dd7ef7736c544de1b66cf0ec40877f6056 100644
--- a/resources/views/edit_user.blade.php
+++ b/resources/views/edit_user.blade.php
@@ -114,6 +114,17 @@
@if($mhs = $user->isMahasiswa())
<form action="/mahasiswa/edit/{{$user->id}}" method="post">
{{csrf_field()}}
+ @if(isset($success_status))
+ @if($success_status)
+ <div class="alert alert-success">
+ Perubahan berhasil disimpan
+ </div>
+ @else
+ <div class="alert alert-danger">
+ Perubahan gagal disimpan
+ </div>
+ @endif
+ @endif
<div class="form-group row">
<label for="status" class="col-md-4 col-form-label text-md-right">Status</label>
<select class="mr-4" name="status" id="status" >
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 83eba2e5d24ff1df0d0a644bfe7f3bc981decad3..d73821955b2fa786f1c746f52da6fd17f6a8ddec 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -55,7 +55,7 @@
@endif
@if(Auth::user()->isMahasiswa())
<a class="dropdown-item text-color-primary" href="/dashboard/mahasiswa">
- Dashboard Manajer
+ Dashboard Mahasiswa
</a>
@endif
<a class="dropdown-item text-color-primary" href="/user/control/{{Auth::user()->username}}">
diff --git a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
index fc1a03f4fa87ecbc0dd2b39230170e5d15826a88..a7ba8d6eac4accba2a5c5d30a4a881a46f72d19a 100644
--- a/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
+++ b/resources/views/mahasiswa/form_hasil_bimbingan.blade.php
@@ -7,13 +7,14 @@
$tgl = $hsl_bimbingan[0]->tanggal_waktu;
$tgl = substr(str_replace(" ","T",$tgl),0,16);
$tgl_selanjutnya = $hsl_bimbingan[0]->waktu_bimbingan_selanjutnya;
- $tgl_selanjutnya = substr(str_replace(" ","T",$tgl),0,16);
+ $tgl_selanjutnya = substr(str_replace(" ","T",$tgl_selanjutnya),0,16);
$topik = $hsl_bimbingan[0]->topik;
$diskusi = $hsl_bimbingan[0]->hasil_dan_diskusi;
$rencana = $hsl_bimbingan[0]->rencana_tindak_lanjut;
}else{
$id = 0;
$tgl = "";
+ $tgl_selanjutnya = "";
$topik = "";
$diskusi = "";
$rencana = "";
@@ -76,8 +77,8 @@
<textarea class="form-control col-md-8" name="rencana_tindak_lanjut" form="form-hsl-bimbingan" required>{{$rencana}}</textarea>
</div>
<div class="form-group row col-md-12">
- <label for="waktu_bimbingan_selanjutnya" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan Selanjutnya<sup>*</sup></label>
- <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl}}" required>
+ <label for="waktu_bimbingan_selanjutnya" class="col-md-4 col-form-label text-md-right text-center">Waktu Bimbingan Selanjutnya</label>
+ <input type="datetime-local" id="waktu_bimbingan_selanjutnya" name="waktu_bimbingan_selanjutnya" class="form-control col-md-8 " value="{{$tgl_selanjutnya}}">
</div>
</div>
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 56c74ebd55016c28684ed2121666ef77dc6587c8..d29831f447ea50db4f67a9890b5bd589061ae088 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -10,111 +10,147 @@
@php($tesis = $mahasiswa->tesis())
@php($topik = $mahasiswa->getApprovedTopic())
@if($tesis)
- @php($sidangTesis = $tesis->sidangTesis())
+ @php($sidangTesis = $tesis->sidangTesis())
@endif
<div class="container detail-mahasiswa-control-page">
<div class="row">
<div class="col-md-4">
<div class="status-table">
<div class="row header">
- Status Mahasiswa
+ Status Mahasiswa
</div>
<div class="content-wrapper">
- <div class="row">
- <span>Name:</span>
- <span>{{$user->name}}</span>
- </div>
- <div class="row">
- <span>NIM:</span>
- <span>{{$user->username}}</span>
- </div>
- <div class="row">
- <span>Email:</span>
- <span>{{$user->email}}</span>
- </div>
- <div class="row">
- <span>Phone:</span>
- <span>{{$user->phone}}</span>
- </div>
- <div class="row">
- <span> Status: </span>
- <span> {{$mahasiswa->getStatusString()}} </span>
- </div>
+ <div class="row">
+ <span>Name:</span>
+ <span>{{$user->name}}</span>
+ </div>
+ <div class="row">
+ <span>NIM:</span>
+ <span>{{$user->username}}</span>
+ </div>
+ <div class="row">
+ <span>Email:</span>
+ <span>{{$user->email}}</span>
+ </div>
+ <div class="row">
+ <span>Phone:</span>
+ <span>{{$user->phone}}</span>
+ </div>
+ <div class="row">
+ <span> Status: </span>
+ <span> {{$mahasiswa->getStatusString()}} </span>
+ </div>
</div>
</div>
</div>
<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)
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#topik">Seminar Topik</a>
</li>
+ @else
+ <li class="nav-item">
+ <a class="nav-link" data-toggle="tab" href="#topik">Seminar Topik</a>
+ </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))
+ <li class="nav-item">
+ <a class="nav-link active" data-toggle="tab" href="#proposal">Seminar Proposal</a>
+ </li>
+ @else
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#proposal">Seminar Proposal</a>
</li>
+ @endif
+
+ @if($mahasiswa->status == \App\Mahasiswa::STATUS_MASA_BIMBINGAN)
+ <li class="nav-item">
+ <a class="nav-link active" data-toggle="tab" href="#bimbingan">Bimbingan</a>
+ </li>
+ @else
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#bimbingan">Bimbingan</a>
</li>
+ @endif
+
+ @if(($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS and $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) || ($mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS))
+ <li class="nav-item">
+ <a class="nav-link active" data-toggle="tab" href="#seminartesis">Seminar Tesis</a>
+ </li>
+
+ @else
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#seminartesis">Seminar Tesis</a>
</li>
+ @endif
+
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
+ <li class="nav-item">
+ <a class="nav-link active" data-toggle="tab" href="#sidangtesis">Sidang Tesis</a>
+ </li>
+ @else
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#sidangtesis">Sidang Tesis</a>
</li>
+ @endif
</ul>
<!-- Tab panes -->
<div class="tab-content">
- <div id="topik" class="container tab-pane active"><br>
+ <div id="topik" class="container tab-pane fade"><br>
@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 || $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}}
- pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
+ <div class="control-seminar-topik mb-4">
+ <h3>
+ Penilaian Seminar Topik
+ </h3>
+ @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}}
+ pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
- </div>
- <fieldset disabled="disabled">
- @elseif($mahasiswa->status <= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK)
- <div class="alert alert-danger 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}}
- pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
- </div>
- @endif
- <div class="row justify-content-center">
-
- <form action=" {{route('seminartopik-penilaian')}}" method="post">
- {{csrf_field()}}
- <input type="hidden" value="{{$mahasiswa->id}}" name="mahasiswa">
- <input type="hidden" value="{{$seminarTopik->id}}" name="seminartopik">
- <button class="btn btn-red mr-4 width-100" name="action" value="0">
- Tidak Lulus
- </button>
- <button class="btn btn-blue ml-4 width-100" name="action" value="1">
- Lulus
- </button>
- </form>
+ </div>
+ <fieldset disabled="disabled">
+ @elseif($mahasiswa->status <= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK)
+ <div class="alert alert-danger 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}}
+ pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
+ </div>
+ @endif
+ <div class="row justify-content-center">
+
+ <form action=" {{route('seminartopik-penilaian')}}" method="post">
+ {{csrf_field()}}
+ <input type="hidden" value="{{$mahasiswa->id}}" name="mahasiswa">
+ <input type="hidden" value="{{$seminarTopik->id}}" name="seminartopik">
+ <button class="btn btn-red mr-4 width-100" name="action" value="0">
+ Tidak Lulus
+ </button>
+ <button class="btn btn-blue ml-4 width-100" name="action" value="1">
+ Lulus
+ </button>
+ </form>
+ </div>
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK)
+ </fieldset>
+ @endif
</div>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK)
- </fieldset>
- @endif
- </div>
@endif
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_DITERIMA || $mahasiswa->status < \App\Mahasiswa::STATUS_TOPIK_DITOLAK || $mahasiswa->status > \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_DITERIMA || $mahasiswa->status < \App\Mahasiswa::STATUS_TOPIK_DITOLAK)
+ @if ($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 || $mahasiswa->status <= \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ @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}}
@@ -123,28 +159,29 @@
</div>
<fieldset disabled="disabled">
- @endif
- <form action="{{route('seminartopik-penetapan')}}" method="post">
- {{csrf_field()}}
- <input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
- <div class="row justify-content-center">
- <div>
- <input type="datetime-local" class="form-control" name="date"
- @if($seminarTopik)
- value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
- @endif
- >
- </div>
- <button class="btn btn-blue ml-4">
- Tetapkan
- </button>
- </div>
- </form>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK)
+ @endif
+ <form action="{{route('seminartopik-penetapan')}}" method="post">
+ {{csrf_field()}}
+ <input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
+ <div class="row justify-content-center">
+ <div>
+ <input type="datetime-local" class="form-control" name="date"
+ @if($seminarTopik)
+ value="{{date("Y-m-d\TH:i:s", strtotime($seminarTopik->schedule))}}"
+ @endif
+ >
+ </div>
+ <button class="btn btn-blue ml-4">
+ Tetapkan
+ </button>
+ </div>
+ </form>
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK)
</fieldset>
@endif
</div>
</div>
+ @endif
@endif
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_TELAH_DIAJUKAN || $mahasiswa->status<=\App\Mahasiswa::STATUS_TOPIK_DITOLAK)
<div class="section" id="pengajuan-topik mb-4">
@@ -154,99 +191,99 @@
@php($approval = $mahasiswa->getTopicApproval())
@if($approval->action == App\TopicApproval::ACTION_TERIMA)
<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>
-  "{{$approval->topic->judul}}" telah disetujui oleh {{$approval->manajer->user()->name}}
- pada {{date("d M Y H:i:s", strtotime($approval->created_at.'UTC'))}}
- </div>
- <fieldset disabled="disabled">
- @elseif($approval->action == App\TopicApproval::ACTION_TOLAK)
- <div class="alert alert-danger row align-items-center flex-row display-flex flex-wrap-nowrap">
- <i class="material-icons font-size-18-px">cancel</i>
- Semua Topik ditolak oleh {{$approval->manajer->user()->name}}
+ <i class="material-icons font-size-18-px mr-2">check_circle</i>
+  "{{$approval->topic->judul}}" telah disetujui oleh {{$approval->manajer->user()->name}}
pada {{date("d M Y H:i:s", strtotime($approval->created_at.'UTC'))}}
</div>
- @endif
- @endif
- <form action="{{route('topicapproval')}}" method="post">
- {{csrf_field()}}
- <input type="hidden" name="mahasiswa" value="{{$user->username}}">
- @foreach($mahasiswa->getTopics() as $item)
- <div class="topik-wrapper">
- <h4>Topik Prioritas {{$loop->iteration}}</h4>
- <div class="row">
- <div class="col-md-8">
- <div class="row mt-1">
+ <fieldset disabled="disabled">
+ @elseif($approval->action == App\TopicApproval::ACTION_TOLAK)
+ <div class="alert alert-danger row align-items-center flex-row display-flex flex-wrap-nowrap">
+ <i class="material-icons font-size-18-px">cancel</i>
+ Semua Topik ditolak oleh {{$approval->manajer->user()->name}}
+ pada {{date("d M Y H:i:s", strtotime($approval->created_at.'UTC'))}}
+ </div>
+ @endif
+ @endif
+ <form action="{{route('topicapproval')}}" method="post">
+ {{csrf_field()}}
+ <input type="hidden" name="mahasiswa" value="{{$user->username}}">
+ @foreach($mahasiswa->getTopics() as $item)
+ <div class="topik-wrapper">
+ <h4>Topik Prioritas {{$loop->iteration}}</h4>
+ <div class="row">
+ <div class="col-md-8">
+ <div class="row mt-1">
<span class="status-label">
Judul Tesis: 
</span>
- <span>
+ <span>
{{$item->judul}}
</span>
- </div>
+ </div>
- <div class="row">
+ <div class="row">
<span>
Bidang Keilmuan: 
</span>
- <span>
+ <span>
{{$item->keilmuan}}
</span>
- </div>
+ </div>
- <div class="row mt-1">
+ <div class="row mt-1">
<span class="status-label">
Calon Pembimbing 1:  
</span>
- <span>
+ <span>
{{$item->dosen_pembimbing1->user->name}}
</span>
- </div>
- <div class="row mt-1">
+ </div>
+ <div class="row mt-1">
<span class="status-label">
Calon Pembimbing 2:  
</span>
- <span>
+ <span>
@if($item->calon_pembimbing2)
- {{$item->dosen_pembimbing2->user->name}}
- @endif
+ {{$item->dosen_pembimbing2->user->name}}
+ @endif
</span>
- </div>
- </div>
- <div class="col-md-4 row mt-4 mt-md-0">
- <div class="col-6 text-center row align-items-center flex-column justify-content-center">
- <div>Status</div>
- <div><b>{!! $item->getStatusString() !!}</b></div>
- </div>
- <div class="col-6 row align-items-center justify-content-center">
- <button class="btn btn-blue" value="{{$item->id}}" name="id">
- Terima
+ </div>
+ </div>
+ <div class="col-md-4 row mt-4 mt-md-0">
+ <div class="col-6 text-center row align-items-center flex-column justify-content-center">
+ <div>Status</div>
+ <div><b>{!! $item->getStatusString() !!}</b></div>
+ </div>
+ <div class="col-6 row align-items-center justify-content-center">
+ <button class="btn btn-blue" value="{{$item->id}}" name="id">
+ Terima
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ @endforeach
+ <div class="row justify-content-center">
+ <button class="btn btn-red" value="-1" name="id">
+ Tolak Semua
</button>
</div>
- </div>
- </div>
- </div>
-
- @endforeach
- <div class="row justify-content-center">
- <button class="btn btn-red" value="-1" name="id">
- Tolak Semua
- </button>
- </div>
- </form>
- @if($mahasiswa->status > 1)
- </fieldset>
- @endif
+ </form>
+ @if($mahasiswa->status > 1)
+ </fieldset>
+ @endif
</div>
@endif
</div>
<div id="proposal" class="container tab-pane fade"><br>
-
+
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL )
<div class="control-seminar-topik mb-4">
@@ -260,76 +297,76 @@
pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
</div>
<fieldset disabled="disabled">
- @endif
- <div class="row justify-content-center">
- <form action="{{route('dosbing-penetapan')}}" class="width-full" method="post">
- {{csrf_field()}}
- <input type="hidden" name="mahasiswa_id" value="{{$mahasiswa->id}}">
- <div class="form-group row">
- <label for="name" class="col-md-4 col-form-label text-md-right">Topik</label>
- <div class="col-md-6">
- <input type="text" class="form-control" value="{{$topik->judul}}" name="judul">
+ @endif
+ <div class="row justify-content-center">
+ <form action="{{route('dosbing-penetapan')}}" class="width-full" method="post">
+ {{csrf_field()}}
+ <input type="hidden" name="mahasiswa_id" value="{{$mahasiswa->id}}">
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Topik</label>
+ <div class="col-md-6">
+ <input type="text" class="form-control" value="{{$topik->judul}}" name="judul">
+ </div>
</div>
- </div>
- <div class="form-group row">
- <label for="name" class="col-md-4 col-form-label text-md-right">Keilmuan</label>
- <div class="col-md-6">
- <input type="text" class="form-control" value="{{$topik->keilmuan}}" name="keilmuan">
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Keilmuan</label>
+ <div class="col-md-6">
+ <input type="text" class="form-control" value="{{$topik->keilmuan}}" name="keilmuan">
+ </div>
</div>
- </div>
- <div class="form-group row">
- <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 1</label>
- <div class="col-md-6">
- <select name="dosen_pembimbing_1" class="form-control" id="">
- @if($tesis)
- <option value="{{$tesis->dosen_pembimbing1}}" selected>
- {{$tesis->dosen_pembimbing_1->user->name}}
- </option>
- @else
- @foreach(\App\Dosen::getListDosenPembimbing1() as $item)
- @php($user_item = $item->user)
- <option value="{{$user_item->id}}"
- @if($topik->calon_pembimbing1 == $item->id)
- selected
- @endif
- >{{$user_item->name}}</option>
- @endforeach
- @endif
- </select>
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 1</label>
+ <div class="col-md-6">
+ <select name="dosen_pembimbing_1" class="form-control" id="">
+ @if($tesis)
+ <option value="{{$tesis->dosen_pembimbing1}}" selected>
+ {{$tesis->dosen_pembimbing_1->user->name}}
+ </option>
+ @else
+ @foreach(\App\Dosen::getListDosenPembimbing1() as $item)
+ @php($user_item = $item->user)
+ <option value="{{$user_item->id}}"
+ @if($topik->calon_pembimbing1 == $item->id)
+ selected
+ @endif
+ >{{$user_item->name}}</option>
+ @endforeach
+ @endif
+ </select>
+ </div>
</div>
- </div>
- <div class="form-group row">
- <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 2</label>
- <div class="col-md-6">
- <select name="dosen_pembimbing_2" class="form-control" id="">
- @if($tesis && $tesis->dosen_pembimbing_2)
- <option value="{{$tesis->dosen_pembimbing2}}" selected>
- {{$tesis->dosen_pembimbing_2->user->name}}
- </option>
- @else
- <option value=""></option>
- @foreach(\App\Dosen::getListDosenPembimbing2() as $item)
- @php($user_item = $item->user)
- <option value="{{$user_item->id}}"
- @if($topik->calon_pembimbing2 == $item->id)
- selected
- @endif
- >{{$user_item->name}}</option>
- @endforeach
- @endif
- </select>
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 2</label>
+ <div class="col-md-6">
+ <select name="dosen_pembimbing_2" class="form-control" id="">
+ @if($tesis && $tesis->dosen_pembimbing_2)
+ <option value="{{$tesis->dosen_pembimbing2}}" selected>
+ {{$tesis->dosen_pembimbing_2->user->name}}
+ </option>
+ @else
+ <option value=""></option>
+ @foreach(\App\Dosen::getListDosenPembimbing2() as $item)
+ @php($user_item = $item->user)
+ <option value="{{$user_item->id}}"
+ @if($topik->calon_pembimbing2 == $item->id)
+ selected
+ @endif
+ >{{$user_item->name}}</option>
+ @endforeach
+ @endif
+ </select>
+ </div>
</div>
- </div>
- <div class="row justify-content-center">
- <button class="btn btn-blue">
- Tetapkan
- </button>
- </div>
- </form>
- </div>
+ <div class="row justify-content-center">
+ <button class="btn btn-blue">
+ Tetapkan
+ </button>
+ </div>
+ </form>
+ </div>
</div>
@endif
@@ -355,29 +392,53 @@
pada {{date("d M Y H:i:s", strtotime($seminarTopik->updated_at.'UTC'))}}
</div>
@endif
- <div class="row justify-content-center">
-
+ <div class="row justify-content-center" id="penilaian-seminar-proposal">
<form action=" {{route('seminarproposal-penilaian')}}" method="post" class="width-full">
{{csrf_field()}}
<input type="hidden" value="{{$mahasiswa->id}}" name="mahasiswa">
<input type="hidden" value="{{$seminarProposal->id}}" name="seminartopik">
<div class="form-group row width-full justify-content-center">
- <label for="scoreIndex" class=" col-sm-2 text-right col-form-label mr-1 ml-1">Nilai</label>
- <select class="form-control col-sm-2 ml-1 mr-1" name="score" id="scoreIndex"
-
- >
- <option value="A">A</option>
- <option value="AB">AB</option>
- <option value="B">B</option>
- <option value="BC">BC</option>
- <option value="C">C</option>
- <option value="D">D</option>
- <option value="E">E</option>
- </select>
- <button class="col-md-2 btn btn-blue ml-1 mr-1">
- Tetapkan
- </button>
+ <label for="scoreDosenPembimbing" class=" col-sm-4 text-right col-form-label mr-1 ml-1">Nilai Dosen Pembimbing</label>
+ <select name="score_dosen_pembimbing" id="scoreDosenPembimbing"
+ class="form-control col-sm-4 ml-1 mr-1" v-model="pembimbing" v-on:change="recalculate">
+ <option value="B">B</option>
+ <option value="C">C</option>
+ <option value="K">K</option>
+ </select>
+
</div>
+ <div class="form-group row width-full justify-content-center">
+ <label for="scoreDosenPenguji" class=" col-sm-4 text-right col-form-label mr-1 ml-1">Nilai Dosen Penguji</label>
+ <select name="score_dosen_penguji" id="scoreDosenPenguji"
+ class="form-control col-sm-4 ml-1 mr-1" v-model="penguji" v-on:change="recalculate">
+ <option value="B">B</option>
+ <option value="C">C</option>
+ <option value="K">K</option>
+ </select>
+
+ </div>
+
+ <div class="form-group row width-full justify-content-center">
+ <label for="scoreIndex" class=" col-sm-4 text-right col-form-label mr-1 ml-1">Nilai Akhir</label>
+ <select class="form-control col-sm-4 ml-1 mr-1" name="score" id="scoreIndex"
+ v-model="akhir"
+ >
+ <option value="A">A</option>
+ <option value="AB">AB</option>
+ <option value="B">B</option>
+ <option value="BC">BC</option>
+ <option value="C">C</option>
+ <option value="D">D</option>
+ <option value="E">E</option>
+ </select>
+
+ </div>
+ <div class="row justify-content-center">
+ <button class="col-md-2 btn btn-blue ml-1 mr-1">
+ Tetapkan
+ </button>
+ </div>
+
</form>
</div>
@@ -402,7 +463,7 @@
<fieldset disabled="disabled">
@endif
<div class="row col-md-12 flex-wrap-nowrap justify-content-center">
- <form action="{{route('seminarproposal-penetapan')}}" method="post">
+ <form action="{{route('seminarproposal-penetapan')}}" method="post" class="col-md-12">
{{csrf_field()}}
<input type="hidden" name="mahasiswa" value="{{$mahasiswa->id}}">
<div class="row justify-content-center">
@@ -413,6 +474,73 @@
@endif
>
</div>
+ </div>
+ <div class="form-group row mt-2">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 1</label>
+ <div class="col-md-6">
+ <select name="dosen_pembimbing_1" class="form-control" id="" required>
+ @if($seminarProposal)
+ <option value="{{$seminarProposal->id_dosen_pembimbing_1}}" selected>
+ {{$seminarProposal->dosen_pembimbing_1->user->name}}
+ </option>
+ @else
+ @foreach(\App\Dosen::getListDosenPembimbing1() as $item)
+ @php($user_item = $item->user)
+ <option value="{{$user_item->id}}"
+ @if($topik->calon_pembimbing1 == $item->id)
+ selected
+ @endif
+ >{{$user_item->name}}</option>
+ @endforeach
+ @endif
+ </select>
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Pembimbing 2</label>
+ <div class="col-md-6">
+ <select name="dosen_pembimbing_2" class="form-control" id="">
+ @if($seminarProposal)
+ @if($seminarProposal->dosen_pembimbing_2)
+ <option value="{{$seminarProposal->id_dosen_pembimbing_2}}" selected>
+ {{$seminarProposal->dosen_pembimbing_2->user->name}}
+ </option>
+ @endif
+ @else
+ <option value="">
+
+ </option>
+ @foreach(\App\Dosen::getListDosenPembimbing2() as $item)
+ @php($user_item = $item->user)
+ <option value="{{$user_item->id}}"
+ >{{$user_item->name}}</option>
+ @endforeach
+ @endif
+ </select>
+ </div>
+ </div>
+
+
+ <div class="form-group row">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Dosen Penguji</label>
+ <div class="col-md-6">
+ <select name="dosen_penguji" class="form-control" id="">
+ @if($seminarProposal)
+ <option value="{{$seminarProposal->id_dosen_penguji}}" selected>
+ {{$seminarProposal->dosen_penguji->user->name}}
+ </option>
+ @else
+ @foreach(\App\Dosen::getListDosenPenguji() as $item)
+ @php($user_item = $item->user)
+ <option value="{{$user_item->id}}"
+ >{{$user_item->name}}</option>
+ @endforeach
+ @endif
+ </select>
+ </div>
+ </div>
+
+ <div class="row">
<button class="btn btn-blue ml-4">
Tetapkan
</button>
@@ -426,656 +554,1124 @@
@endif
<div class="control-pengajuan-proposal mb-4">
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN || $mahasiswa->status <= \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
- @php($proposal = $mahasiswa->proposal())
- <h3>
- Pengajuan Proposal
- </h3>
- @if( $mahasiswa->status != \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN)
- @if($mahasiswa->status != \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN || $mahasiswa->status <= \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ @php($proposal = $mahasiswa->proposal())
+ <h3>
+ Pengajuan Proposal
+ </h3>
+ @if( $mahasiswa->status != \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN)
+ @if($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>
- Proposal {{$proposal->filename}} diterima oleh {{$proposal->evaluator->name}} pada
- {{date("d M Y H:i:s", strtotime($proposal->updated_at.'UTC'))}}
- </div>
- <fieldset disabled="disabled">
- @elseif($mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
- <div class="alert alert-danger row align-items-center flex-row display-flex flex-wrap-nowrap">
- <i class="material-icons font-size-18-px mr-2">cancel</i>
- Proposal {{$proposal->filename}} ditolak oleh {{$proposal->evaluator->name}} pada
+ <i class="material-icons font-size-18-px mr-2">check_circle</i>
+ Proposal {{$proposal->filename}} diterima oleh {{$proposal->evaluator->name}} pada
{{date("d M Y H:i:s", strtotime($proposal->updated_at.'UTC'))}}
</div>
- @endif
- @endif
- <div class="row col-md-12 flex-wrap-nowrap proposal-container">
- <div class="row align-items-center justify-content-start file-name width-full">
- <i class="material-icons">insert_drive_file</i>
- <a href="/proposal/download/{{$proposal->path}}">{{$proposal->filename}} ({{$proposal->human_filesize()}})</a>
- <br>
- </div>
- <form action="{{route('proposal-penerimaan')}}" method="post" class="width-full">
- <div class=" width-full text-right flex-wrap-nowrap">
- {{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>
-
- </div>
- @if($proposal->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA)
- </fieldset>
- @endif
- @endif
-
- <div id="bimbingan" class="container tab-pane fade"><br>
-
-
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL )
- @php($hasilBimbinganAktif = $mahasiswa->tesis()->getHasilBimbinganAktif())
- <div class="control-masa-bimbingan mb-4">
- <h3>
- Masa Bimbingan
- </h3>
- </div>
- <table class="mahasiswa-control-table width-full table table-hover">
- <thead>
- <tr class="text-center">
- <th>
- No
- </th>
- <th>
- Topik
- </th>
- <th>
- Waktu Bimbingan
- </th>
- <th>
- Status
- </th>
- <th></th>
- </tr>
- </thead>
-
- @foreach($hasilBimbinganAktif as $item)
- <tr class="text-center">
- <td>
- {{$loop->iteration}}
- </td>
- <td>
- {{$item->topik}}
- </td>
- <td>
- {{$item->tanggal_waktu}}
- </td>
- <td>
- {{$item->getStatusString()}}
- </td>
-
- <td class="row">
- <button class="btn btn-icon display-flex justify-content-center align-items-center" data-toggle="modal" data-target="#hsl{{$loop->iteration}}">
- <i class="material-icons font-size-18-px">
- search
- </i>
- </button>
-
- <div class="modal fade" id="hsl{{$loop->iteration}}">
- <div class="modal-dialog">
- <div class="modal-content">
-
- <!-- Modal Header -->
- <div class="modal-header">
- <h4 class="modal-title">Topik: {{$item->topik}}</h4>
- <button type="button" class="close" data-dismiss="modal">×</button>
- </div>
-
- <!-- Modal body -->
- <div class="modal-body">
- <h5>Dosen Pembimbing: </h5>
- <p>{{$item->dosen_pembimbing->user1()->name}}</p>
- <h5>Waktu Bimbingan: </h5>
- <p>{{$item->tanggal_waktu}}</p>
- <h5>Hasil dan diskusi: </h5>
- <p>{{$item->hasil_dan_diskusi}}</p>
- <h5>Rencana tindak lanjut:</h5>
- <p>{{$item->rencana_tindak_lanjut}}</p>
-
- </div>
-
- <!-- Modal footer -->
- <div class="modal-footer">
- <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
- </div>
-
- </div>
+ <fieldset disabled="disabled">
+ @elseif($mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
+ <div class="alert alert-danger row align-items-center flex-row display-flex flex-wrap-nowrap">
+ <i class="material-icons font-size-18-px mr-2">cancel</i>
+ Proposal {{$proposal->filename}} ditolak oleh {{$proposal->evaluator->name}} pada
+ {{date("d M Y H:i:s", strtotime($proposal->updated_at.'UTC'))}}
</div>
- </div>
-
- </td>
-
- </tr>
- @endforeach
- </table>
- @endif
- </div>
-
- <div id="seminartesis" class="container tab-pane fade"><br>
- <h3>Seminar Tesis</h3>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS || $mahasiswa->status <= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- @php($seminarTesis = $mahasiswa->tesis()->seminarTesis())
-
- <div class="control-seminar-tesis mb-4s">
+ @endif
+ @endif
+ <div class="row col-md-12 flex-wrap-nowrap proposal-container">
+ <div class="row align-items-center justify-content-start file-name width-full">
+ <i class="material-icons">insert_drive_file</i>
+ <a href="/proposal/download/{{$proposal->path}}">{{$proposal->filename}} ({{$proposal->human_filesize()}})</a>
+ <br>
+ </div>
+ <form action="{{route('proposal-penerimaan')}}" method="post" class="width-full">
+ <div class=" width-full text-right flex-wrap-nowrap">
+ {{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>
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
- <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-4">check_circle</i>
- <span>
- Kelulusan Seminar Tesis telah ditetapkan oleh {{$seminarTesis->evaluator->name}}
- pada {{date("d M Y H:i:s", strtotime($seminarTesis->updated_at.'UTC'))}}
- </span>
- </div>
- <fieldset disabled="disabled">
+ </div>
+ @if($proposal->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA)
+ </fieldset>
+ @endif
@endif
- @if($mahasiswa->status != \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <div>
- <form action="/seminartesis/edit/{{$user->username}}" method="post">
- {{csrf_field()}}
- <div class="form-group row col-md-12">
- <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
- </label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" value="{{$seminarTesis->hari}}" >
- </div>
- <div class="form-group row col-md-12">
- <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
- Waktu
- </label>
- <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" value="{{$seminarTesis->waktu}}">
- </div>
-
- <div class="form-group row col-md-12">
- <label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
- Tempat
- </label>
- <input type="string" id="tempat" name="tempat" class="col-md-8 form-control" value="{{$seminarTesis->tempat}}">
- </div>
- <div class="form-group row col-md-12">
- @php($db1 = $seminarTesis->tesis->dosen_pembimbing_1)
- <label for="tempat" class="col-md-6 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
- {{$db1->user->name}}
- </label>
-
- <div class="align-items-center text-md-left text-center col-md-6 display-flex">
- {!!$seminarTesis->getApprovalStringPembimbing1()!!}
- </div>
-
- </div>
+ <div id="bimbingan" class="container tab-pane fade"><br>
- <div class="form-group row col-md-12">
- @php($db2 = $seminarTesis->tesis->dosen_pembimbing_2)
- @if($db2)
- <label for="tempat" class="col-md-6 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
- {{$db2->user->name}}
- </label>
-
- <div class="align-items-center text-md-left text-center col-md-6 display-flex">
- {!!$seminarTesis->getApprovalStringPembimbing2()!!}
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN || $mahasiswa->status < \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL )
+ @php($hasilBimbinganAktif = $mahasiswa->tesis()->getHasilBimbinganAktif())
+ <div class="control-masa-bimbingan mb-4">
+ <h3>
+ Masa Bimbingan
+ </h3>
</div>
- @endif
-
- </div>
- <div class="col-md-10 offset-md-1 mb-4">
- <div class="form-checkbox">
- <input type="checkbox" class="form-check-input" id="cb1" name="check-draft-laporan"
- @if($seminarTesis->draft_laporan) checked @endif
- >
- <label for="cb1" class="form-check-label">
- Draft Laporan Tesis diserahkan ke TU paling lambat 3 hari sebelum seminar
- </label>
- </div>
-
- <div class="form-checkbox">
- <input type="checkbox" class="form-check-input" id="cb2" name="check-seminar-dengan-teman" @if($seminarTesis->seminar_dengan_teman) checked @endif>
- <label for="cb2" class="form-check-label"
+ <table class="mahasiswa-control-table width-full table table-hover">
+ <thead>
+ <tr class="text-center">
+ <th>
+ No
+ </th>
+ <th>
+ Topik
+ </th>
+ <th>
+ Waktu Bimbingan
+ </th>
+ <th>
+ Status
+ </th>
+ <th></th>
+ </tr>
+ </thead>
+
+ @foreach($hasilBimbinganAktif as $item)
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration}}
+ </td>
+ <td>
+ {{$item->topik}}
+ </td>
+ <td>
+ {{$item->tanggal_waktu}}
+ </td>
+ <td>
+ {{$item->getStatusString()}}
+ </td>
+
+ <td class="row">
+ <button class="btn btn-icon display-flex justify-content-center align-items-center" data-toggle="modal" data-target="#hsl{{$loop->iteration}}">
+ <i class="material-icons font-size-18-px">
+ search
+ </i>
+ </button>
+
+ <div class="modal fade" id="hsl{{$loop->iteration}}">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <!-- Modal Header -->
+ <div class="modal-header">
+ <h4 class="modal-title">Topik: {{$item->topik}}</h4>
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ </div>
+
+ <!-- Modal body -->
+ <div class="modal-body">
+ <h5>Dosen Pembimbing: </h5>
+ <p>{{$item->dosen_pembimbing->user1()->name}}</p>
+ <h5>Waktu Bimbingan: </h5>
+ <p>{{$item->tanggal_waktu}}</p>
+ <h5>Hasil dan diskusi: </h5>
+ <p>{{$item->hasil_dan_diskusi}}</p>
+ <h5>Rencana tindak lanjut:</h5>
+ <p>{{$item->rencana_tindak_lanjut}}</p>
+
+ </div>
+
+ <!-- Modal footer -->
+ <div class="modal-footer">
+ <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
+ </div>
+
+ </div>
+ </div>
+ </div>
- >
- Bukti (Fotokopi) telah seminar dengan teman diserahkan ke TU
- </label>
- </div>
+ </td>
+ </tr>
+ @endforeach
+ </table>
+ @endif
</div>
- <div class="justify-content-center row">
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">save</i>
- Simpan
- </button>
- </div>
- </form>
- </div>
- @endif
- </div>
- @endif
- </div>
-
- <div id="sidangtesis" class="container tab-pane fade"><br>
-
- @if(isset($sidangTesis->dosen_penguji_1) && isset($sidangTesis->dosen_penguji_2))
- <div class="mb-2">
- <h3>
- Penilaian Sidang Tesis
- </h3>
- <div>
- <table class="table text-center">
- <tr>
- <th></th>
- <th>Substansi</th>
- <th>Buku Tesis</th>
- <th>Presentasi dan Tanya Jawab</th>
- </tr>
- <tr>
- <th>Penguji 1</th>
- @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()}}
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">delete</i>
- Reset
- </button>
- </form>
- </tr>
- <tr>
- <th>Penguji 2</th>
- @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
+ <div id="seminartesis" class="container tab-pane fade"><br>
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS || $mahasiswa->status <= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
+ <h3>Seminar Tesis</h3>
+ @php($seminarTesis = $mahasiswa->tesis()->seminarTesis())
- @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
+ <div class="control-seminar-tesis mb-4s">
- @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()}}
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">delete</i>
- Reset
- </button>
- </form>
- </td>
- </tr>
- <tr>
- <th>Pembimbing</th>
- @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
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
+ <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-4">check_circle</i>
+ <span>
+ Kelulusan Seminar Tesis telah ditetapkan oleh {{$seminarTesis->evaluator->name}}
+ pada {{date("d M Y H:i:s", strtotime($seminarTesis->updated_at.'UTC'))}}
+ </span>
+ </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()}}
+
+ <div class="form-group row col-md-12">
+ <label for="judul" class="col-md-4 col-form-label text-md-right text-center">
+ Judul Tesis
+ </label>
+ <input id="judul" name="judul" class="col-md-8 form-control" value="{{$tesis->judul_thesis}}" >
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
+ Tanggal
+ </label>
+ <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" value="{{$seminarTesis->hari}}" >
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
+ Waktu
+ </label>
+ <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" value="{{$seminarTesis->waktu}}">
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="tempat" class="col-md-4 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
+ Tempat
+ </label>
+ <input type="string" id="tempat" name="tempat" class="col-md-8 form-control" value="{{$seminarTesis->tempat}}">
+ </div>
+ <div class="form-group row col-md-12">
+ @php($db1 = $seminarTesis->tesis->dosen_pembimbing_1)
+ <label for="tempat" class="col-md-6 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
+ {{$db1->user->name}}
+ </label>
+
+ <div class="align-items-center text-md-left text-center col-md-6 display-flex">
+ {!!$seminarTesis->getApprovalStringPembimbing1()!!}
+ </div>
+
+ </div>
+
+ <div class="form-group row col-md-12">
+
+ @php($db2 = $seminarTesis->tesis->dosen_pembimbing_2)
+ @if($db2)
+ <label for="tempat" class="col-md-6 col-form-label text-md-right text-center" value="{{$seminarTesis->hari}}">
+ {{$db2->user->name}}
+ </label>
+
+ <div class="align-items-center text-md-left text-center col-md-6 display-flex">
+ {!!$seminarTesis->getApprovalStringPembimbing2()!!}
+ </div>
+ @endif
- <td>
- <form action="/sidangtesis/nilai/pembimbing/reset/{{$user->username}}" method="post">
- {{csrf_field()}}
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">delete</i>
- Reset
- </button>
- </form>
- </td>
- </tr>
- <tr>
- <th>Dosen Tesis</th>
- @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>
- <form action="/sidangtesis/nilai/kelas/reset/{{$user->username}}" method="post">
- {{csrf_field()}}
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">delete</i>
- Reset
- </button>
- </form>
- </td>
- </tr>
- <tr>
- <th> Nilai Akhir </th>
- <td colspan="4">
- <b>
- @if($sidangTesis->nilai=="E")
- <font color="red">
- TIDAK LULUS
- @else
- <font color="green">
- {{$sidangTesis->nilai}}
+ </div>
+ <div class="col-md-10 offset-md-1 mb-4">
+ <div class="form-checkbox">
+ <input type="checkbox" class="form-check-input" id="cb1" name="check-draft-laporan"
+ @if($seminarTesis->draft_laporan) checked @endif
+ >
+ <label for="cb1" class="form-check-label">
+ Draft Laporan Tesis diserahkan ke TU paling lambat 3 hari sebelum seminar
+ </label>
+ </div>
+
+ <div class="form-checkbox">
+ <input type="checkbox" class="form-check-input" id="cb2" name="check-seminar-dengan-teman" @if($seminarTesis->seminar_dengan_teman) checked @endif>
+ <label for="cb2" class="form-check-label"
+
+ >
+ Bukti (Fotokopi) telah seminar dengan teman diserahkan ke TU
+ </label>
+ </div>
+
+ </div>
+ <div class="justify-content-center row">
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">save</i>
+ Simpan
+ </button>
+ </div>
+ </form>
+ </div>
@endif
- </font>
- </b>
- </td>
- </tr>
- </table>
+ </div>
+ @endif
</div>
- </div>
- @endif
- @if(isset($sidangTesis))
- <div class="mb-2">
- <h3>
- Sidang Tesis
- </h3>
- <div>
- <form action="/sidangtesis/manajer/edit/{{$user->username}}" method="post" id="form-hsl-bimbingan" >
- {{csrf_field()}}
- <div class="form-group">
- <div class="form-group row col-md-12">
- <label for="name" class="col-md-4 col-form-label text-md-right text-center ">Nama<sup>*</sup></label>
- <input type="text" name="name" id="name" class="col-md-8 form-control" value="{{$user->name}}" required disabled>
- </div>
- <div class="form-group row col-md-12">
- <label for="nim" class="col-md-4 col-form-label text-md-right text-center">NIM<sup>*</sup></label>
- <input type="text" name="nim" id="nim" class="col-md-8 form-control" value="{{$user->username}}" required disabled>
- </div>
- <div class="form-group row col-md-12">
- <label for="nim" class="col-md-4 col-form-label text-md-right text-center">Opsi<sup>*</sup></label>
- <input type="text" name="nim" id="nim" class="col-md-8 form-control" value="{{$tesis->keilmuan}}" required disabled>
- </div>
-
- <div class="form-group row col-md-12">
- <label for="judul" class="col-md-4 col-form-label text-md-right text-center ">Judul Tesis<sup>*</sup></label>
- <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->topic}}" required disabled>
- </div>
-
- <div class="form-group">
- <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->semester_terdaftar}}
- </div>
- </div>
- <div class="form-group row col-md-12">
- <label for="tanggal_seminar_tesis" class="col-md-4 col-form-label text-md-right text-center">Waktu Seminar Tesis<sup>*</sup></label>
- <div class="display-flex align-items-center">
-
- @if($sidangTesis->jadwal_seminar)
- {{date("d-m-Y ", strtotime($sidangTesis->jadwal_seminar))}}
- @endif
- </div>
- </div>
- <div class="form-group row col-md-12">
- <label for="" class="col-md-4 col-form-label text-md-right text-center">Dokumen Evaluasi Diri</label>
- <div class="display-flex align-items-center">
- @if($sidangTesis->evaluasi_diri)
- <a href="/sidangtesis/download/{{$sidangTesis->evaluasi_diri}}" class="text-color-blue">
- {{basename($sidangTesis->evaluasi_diri)}}
- </a>
- @else
- Belum Mengumpulkan
- @endif
- </div>
- </div>
- <div class="form-group row col-md-12">
- <label for="" class="col-md-4 col-form-label text-md-right text-center">Draft Makalah</label>
- <div class="display-flex align-items-center">
-
- @if($sidangTesis->draft_makalah)
- <a href="/sidangtesis/download/{{$sidangTesis->draft_makalah}}" class="text-color-blue">
- {{basename($sidangTesis->draft_makalah)}}
- </a>
- @else
- Belum Mengumpulkan
- @endif
- </div>
- </div>
- <div class="form-group row col-md-12">
- <label for="" class="col-md-4 col-form-label text-md-right text-center">Laporan Tesis</label>
- <div class="display-flex align-items-center">
-
- @if($sidangTesis->laporan_tesis)
- <a href="/sidangtesis/download/{{$sidangTesis->evaluasi_diri}}" class="text-color-blue">
- {{basename($sidangTesis->laporan_tesis)}}
- </a>
- @else
- Belum Mengumpulkan
- @endif
- </div>
+ <div id="sidangtesis" class="container tab-pane fade"><br>
- </div>
- <div class="form-group row col-md-12">
- <label for="" class="col-md-4 col-form-label text-md-right text-center">KSM Semester Terakhir</label>
- <div class="display-flex align-items-center">
-
- @if($sidangTesis->ksm_terakhir)
- <a href="/sidangtesis/download/{{$sidangTesis->ksm_terakhir}}" class="text-color-blue">
- {{basename($sidangTesis->ksm_terakhir)}}
- </a>
- @else
- Belum Mengumpulkan
- @endif
- </div>
+ @if(isset($sidangTesis->dosen_penguji_1) && isset($sidangTesis->dosen_penguji_2))
+ <div class="mb-2">
+ <h3>
+ Penilaian Sidang Tesis
+ </h3>
+ <div>
+ <table class="table text-center">
+ <tr>
+ <th></th>
+ <th>Substansi</th>
+ <th>Buku Tesis</th>
+ <th>Presentasi dan Tanya Jawab</th>
+ <th></th>
+ <th></th>
+ </tr>
+ <tr>
+ <th>Penguji 1</th>
+ @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
- </div>
- <div class="form-group row col-md-12">
- <label for="" class="col-md-4 col-form-label text-md-right text-center">Form Submit Paper</label>
- <div class="display-flex align-items-center">
- @if($sidangTesis->submit_paper)
- <a href="/sidangtesis/download/{{$sidangTesis->submit_paper}}" class="text-color-blue">
- {{basename($sidangTesis->submit_paper)}}
- </a>
- @else
- Belum Mengumpulkan
- @endif
- </div>
- </div>
+ @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
- </div>
+ @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>
+ <button class="btn btn-blue align-items-center display-flex" data-toggle="modal" data-target="#nilaipenguji1">
+ <i class="material-icons pencil md-12 font-size-18-px">assignment</i>
+ Nilai
+ </button>
+
+ <div class="modal fade" id="nilaipenguji1">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <!-- Modal Header -->
+ <div class="modal-header">
+ <h4 class="modal-title">Penilaian Sidang (Sebagai Dosen Penguji 1) : {{$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()}}
+
+ <input type="hidden" value="{{$user->username}}" name="mahasiswa">
+ <input type="hidden" value="penguji1" name="roledosen">
+ <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 Substansi</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_1_utama == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_utama == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_utama == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Buku Tesis</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_1_penting == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_penting == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_penting == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Presentasi dan Tanya Jawab</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_1_pendukung == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_pendukung == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_1_pendukung == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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>
+ </form>
+
+ </div>
+
+
+
+
+ <!-- Modal footer -->
+ <div class="modal-footer">
+ <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
+ </div>
+ </td>
+ <td>
+ <form action="/sidangtesis/nilai/penguji1/reset/{{$user->username}}" method="post">
+ {{csrf_field()}}
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">delete</i>
+ Reset
+ </button>
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <th>Penguji 2</th>
+ @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
- <div class="form-group row col-md-12">
- <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
- Tanggal
- </label>
- <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" value="{{$sidangTesis->tanggal}}" >
- </div>
+ @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
- <div class="form-group row col-md-12">
- <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
- Waktu
- </label>
- <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" value="{{$sidangTesis->jam}}">
- </div>
+ @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>
+ <button class="btn btn-blue align-items-center display-flex" data-toggle="modal" data-target="#nilaipenguji2">
+ <i class="material-icons pencil md-12 font-size-18-px">assignment</i>
+ Nilai
+ </button>
+
+ <div class="modal fade" id="nilaipenguji2">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <!-- Modal Header -->
+ <div class="modal-header">
+ <h4 class="modal-title">Penilaian Sidang (Sebagai Dosen Penguji 2) : {{$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()}}
+
+ <input type="hidden" value="{{$user->username}}" name="mahasiswa">
+ <input type="hidden" value="penguji2" name="roledosen">
+ <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 Substansi</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_2_utama == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_utama == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_utama == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Buku Tesis</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_2_penting == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_penting == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_penting == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Presentasi dan Tanya Jawab</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_penguji_2_pendukung == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_pendukung == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_penguji_2_pendukung == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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>
+ </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>
- <div class="form-group row col-md-12">
- <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
- Tempat
- </label>
- <input type="string" id="tempat" name="tempat" class="col-md-8 form-control" value="{{$sidangTesis->tempat}}">
- </div>
- <div class="row offset-md-2 justify-content-center">
- <table width="300" class="table table-hover" style="width: 60%">
- <tr>
- <th colspan="3">
- Ajuan Dosen Penguji
- </th>
- <th>
- Status
- </th>
+ <td>
+ <form action="/sidangtesis/nilai/penguji2/reset/{{$user->username}}" method="post">
+ {{csrf_field()}}
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">delete</i>
+ Reset
+ </button>
+ </form>
+ </td>
</tr>
<tr>
- <td colspan="3">
- {{$sidangTesis->ajuan_penguji_1->name}}
+ <th>Pembimbing</th>
+ @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>
+ <button class="btn btn-blue align-items-center display-flex" data-toggle="modal" data-target="#nilaipembimbing">
+ <i class="material-icons pencil md-12 font-size-18-px">assignment</i>
+ Nilai
+ </button>
+
+ <div class="modal fade" id="nilaipembimbing">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <!-- Modal Header -->
+ <div class="modal-header">
+ <h4 class="modal-title">Penilaian Sidang (Sebagai Dosen Pembimbing) : {{$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()}}
+
+ <input type="hidden" value="{{$user->username}}" name="mahasiswa">
+ <input type="hidden" value="pembimbing" name="roledosen">
+ <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 Substansi</label>
+ <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">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_utama == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_utama == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Buku Tesis</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePenting" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_pembimbing_penting == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_penting == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_penting == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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="scoreIndexUtama" class=" col-sm-4 text-center col-form-label mr-1 ml-1">Nilai Presentasi dan Tanya Jawab</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scorePendukung" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_pembimbing_pendukung == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_pendukung == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_pembimbing_pendukung == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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>
+ </form>
+
+ </div>
+
+
+
+ <!-- Modal footer -->
+ <div class="modal-footer">
+ <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
+ </div>
</td>
+
<td>
- {!! $sidangTesis->approval_status_string($sidangTesis->approval_penguji1) !!}
+ <form action="/sidangtesis/nilai/pembimbing/reset/{{$user->username}}" method="post">
+ {{csrf_field()}}
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">delete</i>
+ Reset
+ </button>
+ </form>
</td>
</tr>
<tr>
- <td colspan="3">
- {{$sidangTesis->ajuan_penguji_2->name}}
+ <th>Dosen Tesis</th>
+ @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>
+ <button class="btn btn-blue align-items-center display-flex" data-toggle="modal" data-target="#nilaikelas">
+ <i class="material-icons pencil md-12 font-size-18-px">assignment</i>
+ Nilai
+ </button>
+
+ <div class="modal fade" id="nilaikelas">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <!-- Modal Header -->
+ <div class="modal-header">
+ <h4 class="modal-title">Penilaian Sidang (Sebagai Dosen Kelas Thesis) : {{$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()}}
+
+ <input type="hidden" value="{{$user->username}}" name="mahasiswa">
+ <input type="hidden" value="kelas" name="roledosen">
+ <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 Substansi</label>
+ <select class="form-control col-sm-2 ml-1 mr-1" name="scoreUtama" id="scoreIndexUtama">
+ @if($sidangTesis->nilai_dosen_kelas_utama == "L")
+ <option selected ="selected" value="L">B</option>
+ <option value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_kelas_utama == "M")
+ <option value="L">B</option>
+ <option selected ="selected" value="M">C</option>
+ <option value="K">K</option>
+ @elseif ($sidangTesis->nilai_dosen_kelas_utama == "K")
+ <option value="L">B</option>
+ <option value="M">C</option>
+ <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>
+ </form>
+
+ </div>
+
+
+
+
+ <!-- Modal footer -->
+ <div class="modal-footer">
+ <button type="submit" class="btn btn-danger" data-dismiss="modal">Tutup</button>
+ </div>
</td>
+
<td>
- {!! $sidangTesis->approval_status_string($sidangTesis->approval_penguji2) !!}
+ <form action="/sidangtesis/nilai/kelas/reset/{{$user->username}}" method="post">
+ {{csrf_field()}}
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">delete</i>
+ Reset
+ </button>
+ </form>
</td>
</tr>
-
<tr>
- <td colspan="3">
- {{$sidangTesis->ajuan_penguji_3->name}}
- </td>
- <td>
- {!! $sidangTesis->approval_status_string($sidangTesis->approval_penguji3) !!}
+ <th> Nilai Akhir </th>
+ <td colspan="4">
+ <b>
+ @if($sidangTesis->nilai=="E")
+ <font color="red">
+ TIDAK LULUS
+ @else
+ <font color="green">
+ {{$sidangTesis->nilai}}
+ @endif
+ </font>
+ </b>
</td>
</tr>
-
</table>
</div>
+ </div>
+ @endif
+ @if(isset($sidangTesis))
+ <div class="mb-2">
+ <h3>
+ Sidang Tesis
+ </h3>
+ <div>
+ <form action="/sidangtesis/manajer/edit/{{$user->username}}" method="post" id="form-hsl-bimbingan" >
+ {{csrf_field()}}
+ <div class="form-group">
+ <div class="form-group row col-md-12">
+ <label for="name" class="col-md-4 col-form-label text-md-right text-center ">Nama<sup>*</sup></label>
+ <input type="text" name="name" id="name" class="col-md-8 form-control" value="{{$user->name}}" required disabled>
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="nim" class="col-md-4 col-form-label text-md-right text-center">NIM<sup>*</sup></label>
+ <input type="text" name="nim" id="nim" class="col-md-8 form-control" value="{{$user->username}}" required disabled>
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="nim" class="col-md-4 col-form-label text-md-right text-center">Opsi<sup>*</sup></label>
+ <input type="text" name="nim" id="nim" class="col-md-8 form-control" value="{{$tesis->keilmuan}}" required disabled>
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="judul" class="col-md-4 col-form-label text-md-right text-center ">Judul Tesis<sup>*</sup></label>
+ <input type="text" id="judul" name="judul" class="col-md-8 form-control" value="{{$mahasiswa->tesis()->judul_thesis}}">
+ </div>
- <div class="form-group row col-md-12">
- <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
- Usulan Dosen Penguji
- </label>
- <select name="dosen_penguji1" class="form-control col-md-8" id="">
- @foreach(App\Dosen::getListDosenPenguji() as $item)
- <option value="{{$item->id}}"
- @if($sidangTesis->dosen_penguji_1 == $item->id)
- selected
+ <div class="form-group">
+ <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->semester_terdaftar}}
+ </div>
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="tanggal_seminar_tesis" class="col-md-4 col-form-label text-md-right text-center">Waktu Seminar Tesis<sup>*</sup></label>
+ <div class="display-flex align-items-center">
+
+ @if($sidangTesis->jadwal_seminar)
+ {{date("d-m-Y ", strtotime($sidangTesis->jadwal_seminar))}}
@endif
+ </div>
+
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="" class="col-md-4 col-form-label text-md-right text-center">Dokumen Evaluasi Diri</label>
+ <div class="display-flex align-items-center">
+ @if($sidangTesis->evaluasi_diri)
+ <a href="/sidangtesis/download/{{$sidangTesis->evaluasi_diri}}" class="text-color-blue">
+ {{basename($sidangTesis->evaluasi_diri)}}
+ </a>
+ @else
+ Belum Mengumpulkan
+ @endif
+ </div>
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="" class="col-md-4 col-form-label text-md-right text-center">Draft Makalah</label>
+ <div class="display-flex align-items-center">
+
+ @if($sidangTesis->draft_makalah)
+ <a href="/sidangtesis/download/{{$sidangTesis->draft_makalah}}" class="text-color-blue">
+ {{basename($sidangTesis->draft_makalah)}}
+ </a>
+ @else
+ Belum Mengumpulkan
+ @endif
+ </div>
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="" class="col-md-4 col-form-label text-md-right text-center">Laporan Tesis</label>
+ <div class="display-flex align-items-center">
+
+ @if($sidangTesis->laporan_tesis)
+ <a href="/sidangtesis/download/{{$sidangTesis->evaluasi_diri}}" class="text-color-blue">
+ {{basename($sidangTesis->laporan_tesis)}}
+ </a>
+ @else
+ Belum Mengumpulkan
+ @endif
+ </div>
+
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="" class="col-md-4 col-form-label text-md-right text-center">KSM Semester Terakhir</label>
+ <div class="display-flex align-items-center">
+
+ @if($sidangTesis->ksm_terakhir)
+ <a href="/sidangtesis/download/{{$sidangTesis->ksm_terakhir}}" class="text-color-blue">
+ {{basename($sidangTesis->ksm_terakhir)}}
+ </a>
+ @else
+ Belum Mengumpulkan
+ @endif
+ </div>
+
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="" class="col-md-4 col-form-label text-md-right text-center">Form Submit Paper</label>
+ <div class="display-flex align-items-center">
+ @if($sidangTesis->submit_paper)
+ <a href="/sidangtesis/download/{{$sidangTesis->submit_paper}}" class="text-color-blue">
+ {{basename($sidangTesis->submit_paper)}}
+ </a>
+ @else
+ Belum Mengumpulkan
+ @endif
+ </div>
+ </div>
- >
- {{$item->user->name}}
+ </div>
- </option>
- @endforeach
- </select>
- </div>
- <div class="form-group row col-md-12">
-
- <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
- Usulan Dosen Penguji
- </label>
- <select name="dosen_penguji2" class="form-control col-md-8" id="">
- @foreach(App\Dosen::getListDosenPenguji() as $item)
- <option value="{{$item->id}}"
- @if($sidangTesis->dosen_penguji_2 == $item->id)
- selected
- @endif
- >
- {{$item->user->name}}
- </option>
- @endforeach
- </select>
- </div>
- </div>
+ <div class="form-group row col-md-12">
+ <label for="haritgl" class="col-md-4 col-form-label text-md-right text-center">
+ Tanggal
+ </label>
+ <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control" value="{{$sidangTesis->tanggal}}" >
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="waktu" class="col-md-4 col-form-label text-md-right text-center">
+ Waktu
+ </label>
+ <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control" value="{{$sidangTesis->jam}}">
+ </div>
+
+ <div class="form-group row col-md-12">
+ <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
+ Tempat
+ </label>
+ <input type="string" id="tempat" name="tempat" class="col-md-8 form-control" value="{{$sidangTesis->tempat}}">
+ </div>
+ <div class="form-group row col-md-12">
+ <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
+ Usulan Dosen Penguji
+ </label>
+ <select name="dosen_penguji1" class="form-control col-md-8" id="">
+ @foreach(App\Dosen::getListDosenPenguji() as $item)
+ <option value="{{$item->id}}"
+ @if($sidangTesis->dosen_penguji_1 == $item->id)
+ selected
+ @endif
+
+ >
+ {{$item->user->name}}
+
+ </option>
+ @endforeach
+ </select>
+ </div>
+ <div class="form-group row col-md-12">
+
+ <label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
+ Usulan Dosen Penguji
+ </label>
+ <select name="dosen_penguji2" class="form-control col-md-8" id="">
+ @foreach(App\Dosen::getListDosenPenguji() as $item)
+ <option value="{{$item->id}}"
+ @if($sidangTesis->dosen_penguji_2 == $item->id)
+ selected
+ @endif
+ >
+ {{$item->user->name}}
+
+ </option>
+ @endforeach
+ </select>
+ </div>
+
+ </div>
- <div class="justify-content-center row">
- <button class="btn btn-blue align-items-center display-flex">
- <i class="material-icons pencil md-12 font-size-18-px">save</i>
- Simpan
- </button>
+ <div class="justify-content-center row" style="padding-bottom: 20px">
+ <button class="btn btn-blue align-items-center display-flex">
+ <i class="material-icons pencil md-12 font-size-18-px">save</i>
+ Simpan
+ </button>
+ </div>
+
+ @if($sidangTesis->ajuan_penguji_1 || $sidangTesis->ajuan_penguji_2 || $sidangTesis->ajuan_penguji_3)
+ <div class="row offset-md-2 justify-content-center">
+ <table width="300" class="table table-hover" style="width: 60%">
+ <tr>
+ <th colspan="3">
+ Ajuan Dosen Penguji
+ </th>
+ <th>
+ Status (Tidak harus disetujui)
+ </th>
+ </tr>
+ @if ($sidangTesis->ajuan_penguji_1)
+ <tr>
+
+ <td colspan="3">
+
+ {{$sidangTesis->ajuan_penguji_1->name}}
+ </td>
+ <td>
+ {!! $sidangTesis->approval_status_string($sidangTesis->approval_penguji1) !!}
+ </td>
+ </tr>
+ @endif
+ @if ($sidangTesis->ajuan_penguji_2)
+ <tr>
+ <td colspan="3">
+ {{$sidangTesis->ajuan_penguji_2->name}}
+ </td>
+ <td>
+ {!! $sidangTesis->approval_status_string($sidangTesis->approval_penguji2) !!}
+ </td>
+ </tr>
+ @endif
+
+ </table>
+ </div>
+ @endif
+ </form>
+ </div>
</div>
- </form>
+ @endif
</div>
- </div>
- @endif
- </div>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
+
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK and $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK)
+ <script>
+ var temp = document.getElementById("topik");
+ temp.classList.remove('fade');
+ temp.classList.add('active');
+ </script>
+ @elseif(($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))
+ <script>
+ var temp = document.getElementById("proposal");
+ temp.classList.remove('fade');
+ temp.classList.add('active');
+ </script>
+ @elseif($mahasiswa->status == \App\Mahasiswa::STATUS_MASA_BIMBINGAN)
+ <script>
+ var temp = document.getElementById("bimbingan");
+ temp.classList.remove('fade');
+ temp.classList.add('active');
+ </script>
+ @elseif(($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS and $mahasiswa->status <= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) || ($mahasiswa->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS))
+ <script>
+ var temp = document.getElementById("seminartesis");
+ temp.classList.remove('fade');
+ temp.classList.add('active');
+ </script>
+ @elseif($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
+ <script>
+ var temp = document.getElementById("sidangtesis");
+ temp.classList.remove('fade');
+ temp.classList.add('active');
+ </script>
+ @endif
+@endsection
+
+@section('bottomjs')
+ <script>
+ var penilaian = new Vue({
+ el: "#penilaian-seminar-proposal",
+ data: {
+ pembimbing: @if($seminarProposal && $seminarProposal->mark_dosen_pembimbing) '{{$seminarProposal->mark_dosen_pembimbing}}' @else 'B' @endif,
+ penguji: @if($seminarProposal && $seminarProposal->mark_dosen_penguji) '{{$seminarProposal->mark_dosen_penguji}}' @else 'B' @endif,
+ akhir: @if($seminarProposal && $seminarProposal->score) '{{$seminarProposal->score}}' @else 'A' @endif
+ },
+ methods: {
+ recalculate: function() {
+ console.log('here');
+ if(this.pembimbing == 'B' && this.penguji == 'B')
+ this.akhir = 'A';
+ else if((this.pembimbing =='C' && this.penguji == 'B') || (this.pembimbing == 'B' && this.penguji == 'C'))
+ this.akhir = 'AB';
+ else if(this.pembimbing == 'C' && this.penguji == 'C')
+ this.akhir = 'B';
+ else if(this.pembimbing == 'C' && this.penguji == 'K')
+ this.akhir = 'BC';
+ else if(this.pembimbing == 'K' && this.penguji == 'C')
+ this.akhir = 'C';
+ else
+ this.akhir = 'E';
+ }
+
+ }
+
+ })
+ </script>
@endsection
\ No newline at end of file
diff --git a/resources/views/manajer/index.blade.php b/resources/views/manajer/index.blade.php
index cb7b29ea1025c173252b55267eed28725ccc4759..43107d5c4c47d937c2210956ba17412ae7393485 100644
--- a/resources/views/manajer/index.blade.php
+++ b/resources/views/manajer/index.blade.php
@@ -9,42 +9,42 @@
<h1>Dashboard</h1>
<div class="row">
<div class="col-xs-6 col-lg-3 text-center">
- <a href="/mahasiswa/control" class="thumbnail">
+ <a href="/mahasiswa/nilaiakhir" class="thumbnail">
<div>
- <i class="material-icons icon-style">group</i>
+ <i class="material-icons icon-style">school</i>
</div>
- Kontrol Mahasiswa
+ Rekap Nilai Akhir Mahasiswa
</a>
</div>
<div class="col-xs-6 col-lg-3 text-center">
- <a href="/register" class="thumbnail">
+ <a href="/mahasiswa/rekap" class="thumbnail">
<div>
- <i class="material-icons icon-style">person_add</i>
+ <i class="material-icons icon-style">poll</i>
</div>
- Register Akun
+ Rekap Perkembangan Mahasiswa
</a>
</div>
<div class="col-xs-6 col-lg-3 text-center">
- <a href="/mahasiswa/nilaiakhir" class="thumbnail">
+ <a href="/mahasiswa/history" class="thumbnail">
<div>
- <i class="material-icons icon-style">school</i>
+ <i class="material-icons icon-style">history</i>
</div>
- Rekap Nilai Akhir Mahasiswa
+ History Mahasiswa
</a>
</div>
<div class="col-xs-6 col-lg-3 text-center">
- <a href="/mahasiswa/rekap" class="thumbnail">
+ <a href="/mahasiswa/control" class="thumbnail">
<div>
- <i class="material-icons icon-style">poll</i>
+ <i class="material-icons icon-style">group</i>
</div>
- Rekap Perkembangan Mahasiswa
+ Kontrol Mahasiswa
</a>
</div>
@@ -58,6 +58,16 @@
</a>
</div>
+ <div class="col-xs-6 col-lg-3 text-center">
+ <a href="/penjadwalan" class="thumbnail">
+ <div>
+ <i class="material-icons icon-style">schedule</i>
+ </div>
+
+ Pengaturan Jadwal Seminar dan Sidang
+ </a>
+ </div>
+
<div class="col-xs-6 col-lg-3 text-center">
<a href="/admin/panel" class="thumbnail">
<div>
@@ -69,12 +79,12 @@
</div>
<div class="col-xs-6 col-lg-3 text-center">
- <a href="/penjadwalan" class="thumbnail">
+ <a href="/register" class="thumbnail">
<div>
- <i class="material-icons icon-style">schedule</i>
+ <i class="material-icons icon-style">person_add</i>
</div>
- Pengaturan Jadwal Seminar dan Sidang
+ Register Akun
</a>
</div>
</div>
diff --git a/resources/views/manajer/kelas_tesis.blade.php b/resources/views/manajer/kelas_tesis.blade.php
index 6dad1810233c0d05b8f5de004d0b93105e920ef9..5e022cad55a493bf9cc91d93e025e15c4129ef5b 100644
--- a/resources/views/manajer/kelas_tesis.blade.php
+++ b/resources/views/manajer/kelas_tesis.blade.php
@@ -29,10 +29,21 @@
{{csrf_field()}}
<tr>
<td>
- <input type="text" id="tahun" name="tahun" class="form-control col-md-8 " value="" required>
+ <select type="text" id="tahun" class="form-control col-md-8" name="tahun">
+ <option value=""> </option>
+ @if(idate("m") > 6)
+ <option value="{{idate("Y")}}">{{idate("Y")}}/{{idate("Y")+1}}</option>
+ @else
+ <option value="{{idate("Y")}}">{{idate("Y")-1}}/{{idate("Y")}}</option>
+ @endif
+ </select>
</td>
<td>
- <input type="text" id="semester" name="semester" class="form-control col-md-8 " value="" required>
+ <select type="text" id="semester" class="form-control col-md-8" name="semester">
+ <option value=""> </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ </select>
</td>
<td>
<select type="text" id="dosen_id" class="form-control col-md-8" name="dosen_id">
@@ -61,7 +72,7 @@
<thead>
<tr class="text-center">
<th>
- ID Kelas
+ No
</th>
<th>
Tahun
@@ -78,10 +89,15 @@
@foreach($kelas_tesis as $item)
<tr class="text-center">
<td>
- {{$item->id}}
+ {{$loop->iteration}}
</td>
<td>
- {{$item->tahun}}
+ @if($item->semester == 1)
+ {{$item->tahun}}/{{$item->tahun+1}}
+ @else
+ {{$item->tahun-1}}/{{$item->tahun}}
+ @endif
+
</td>
<td>
{{$item->semester}}
diff --git a/resources/views/manajer/mahasiswa_control.blade.php b/resources/views/manajer/mahasiswa_control.blade.php
index aa69d58606daf178261fb49cd983dfc8ac825ffb..d93609875ed8ae8316986c45b8df8d08f23d61dd 100644
--- a/resources/views/manajer/mahasiswa_control.blade.php
+++ b/resources/views/manajer/mahasiswa_control.blade.php
@@ -1,5 +1,5 @@
@extends('layouts.app')
-@section('title', 'Topic')
+@section('title', 'Daftar Mahasiswa Aktif')
@section('content')
diff --git a/resources/views/manajer/mahasiswa_history_control.blade.php b/resources/views/manajer/mahasiswa_history_control.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..f267f8a242ae797a854cc824410794e763e05ec2
--- /dev/null
+++ b/resources/views/manajer/mahasiswa_history_control.blade.php
@@ -0,0 +1,57 @@
+@extends('layouts.app')
+@section('title', 'History Mahasiswa')
+
+
+@section('content')
+ <div class="container">
+ <h3>History Mahasiswa Lulus/Nonaktif</h3>
+ <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>
+ Nama
+ </th>
+ <th>
+ NIM
+ </th>
+ <th>
+ Status
+ </th>
+ <th>
+ </th>
+ </tr>
+ </thead>
+ @foreach($mahasiswa as $item)
+ @php($user = $item->user())
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration}}
+ </td>
+ <td>
+ {{$user->name}}
+ </td>
+ <td>
+ {{$user->username}}
+ </td>
+ <td>
+ {{$item->getStatusString()}}
+ </td>
+ <td class="row justify-content-center ">
+ <a href="/mahasiswa/control/{{$user->username}}">
+ <button class="btn btn-icon display-flex justify-content-center align-items-center">
+ <i class="material-icons font-size-18-px">
+ edit
+ </i>
+ </button>
+ </a>
+ </td>
+ </tr>
+ @endforeach
+ </table>
+ </div>
+ </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index a2f7baf5a666996051f6964a9bac4e01f9fcf81b..3104bbbbbaade9365e86d16205b312bddf5a6a88 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -67,24 +67,61 @@
</tr>
@php($count++)
@endforeach
+ @php($prev = -1)
+ @php($no = 1)
@foreach($seminar_topik as $item)
- <tr class="text-center">
- <td>
- {{$loop->iteration + $count}}
- </td>
- <td>
- {{$item->topik->topic->mahasiswa->user()->username}}
- </td>
- <td>
- {{$item->topik->topic->mahasiswa->user()->name}}
- </td>
- <td>
- {{$item->topik->topic->judul}}
- </td>
- <td>
- {{$item->schedule}}
- </td>
- </tr>
+ @php($tgl = $item->schedule)
+ @php($tgl = substr(str_replace(" ","T",$tgl),0,16))
+ @if($prev != $item->topik_id)
+ @if($item->topik->topic->mahasiswa->status == \App\Mahasiswa::STATUS_TOPIK_DITERIMA)
+ <tr class="text-center">
+ <td>
+ {{$no + $count}}
+ </td>
+ <td>
+ {{$item->topik->topic->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->topik->topic->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->topik->topic->judul}}
+ </td>
+ <td>
+ <input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
+ <input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topik_id}}">
+ <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton()">
+ </td>
+ </tr>
+ @php($no++)
+ @endif
+ @endif
+ @php($prev = $item->topik_id)
+ @endforeach
+ @php($prev = -1)
+ @foreach($seminar_topik as $item)
+ @if($prev != $item->topik_id)
+ @if($item->topik->topic->mahasiswa->status > \App\Mahasiswa::STATUS_TOPIK_DITERIMA)
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration + $count + $no - 1}}
+ </td>
+ <td>
+ {{$item->topik->topic->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->topik->topic->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->topik->topic->judul}}
+ </td>
+ <td>
+ {{$item->schedule}}
+ </td>
+ </tr>
+ @endif
+ @endif
+ @php($prev = $item->topik_id)
@endforeach
</table>
</div>
@@ -138,21 +175,59 @@
</tr>
@php($count++)
@endforeach
+ @php($prev = -1)
+ @php($no = 1)
@foreach($seminar_proposal as $item)
- <tr class="text-center">
- <td>
- {{$loop->iteration + $count}}
- </td>
- <td>
- {{$item->mahasiswa->user()->username}}
- </td>
- <td>
- {{$item->mahasiswa->user()->name}}
- </td>
- <td>
- {{$item->schedule}}
- </td>
- </tr>
+ @php($tgl = $item->schedule)
+ @php($tgl = substr(str_replace(" ","T",$tgl),0,16))
+ @if($prev != $item->proposal_id)
+ @if($item->mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA)
+ <tr class="text-center">
+ <td>
+ {{$no + $count}}
+ </td>
+ <td>
+ {{$item->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->mahasiswa->user()->name}}
+ </td>
+ <td>
+ <input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
+ <input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->proposal_id}}">
+ <input type="hidden" id="pa{{$item->mahasiswa_id}}" name="pa{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_pembimbing_1}}">
+ <input type="hidden" id="pb{{$item->mahasiswa_id}}" name="pb{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_pembimbing_2}}">
+ <input type="hidden" id="pg{{$item->mahasiswa_id}}" name="pg{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id_dosen_penguji}}">
+ <input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="{{$tgl}}" onkeyup="updateSaveButton2()">
+ </td>
+ </tr>
+ @php($no++)
+ @endif
+ @endif
+ @php($prev = $item->proposal_id)
+ @endforeach
+
+ @php($prev = -1)
+ @foreach($seminar_proposal as $item)
+ @if($prev != $item->proposal_id)
+ @if($item->mahasiswa->status > \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA)
+ <tr class="text-center">
+ <td>
+ {{$loop->iteration + $count + $no - 1}}
+ </td>
+ <td>
+ {{$item->mahasiswa->user()->username}}
+ </td>
+ <td>
+ {{$item->mahasiswa->user()->name}}
+ </td>
+ <td>
+ {{$item->schedule}}
+ </td>
+ </tr>
+ @endif
+ @endif
+ @php($prev = $item->proposal_id)
@endforeach
</table>
</div>
diff --git a/resources/views/manajer/rekap_data_mahasiswa.blade.php b/resources/views/manajer/rekap_data_mahasiswa.blade.php
index e76586a0ac726c91db3c256ca4fc05b953623c22..49a82861ef30c43d9f7be78354aa757628961ed1 100644
--- a/resources/views/manajer/rekap_data_mahasiswa.blade.php
+++ b/resources/views/manajer/rekap_data_mahasiswa.blade.php
@@ -7,6 +7,15 @@
@section('content')
<div class="container">
<h1>Rekap Perkembangan Mahasiswa</h1>
+ <div class="btns">
+ <button class="advancer-btn btn-primary paddle hidden left-btn">
+ <
+ </button>
+ <button class="advancer-btn btn-primary paddle right-btn">
+ >
+ </button>
+ </div>
+
<div class="row rekap-table">
<div class="row justify-content-center left table-responsive">
<table class="rekap-name-table table table-hover">
@@ -20,9 +29,9 @@
</tr>
<tr>
- <td class="dummy" scope="col" height="92"></td>
- <td class="dummy" scope="col" height="92"></td>
- <td class="dummy" height="92"></td>
+ <td class="dummy" scope="col" height="90.67"></td>
+ <td class="dummy" scope="col" height="90.67"></td>
+ <td class="dummy" height="90.67"></td>
</tr>
@foreach($mahasiswa as $item)
@@ -35,18 +44,17 @@
</table>
</div>
-
- <div class="row justify-content-center table-responsive right">
- <table class="mahasiswa-control-table table table-hover">
+ <div class="progress-mhs row justify-content-center table-responsive right">
+ <table class="rekap-table table table-hover table-bordered">
<colgroup span="4"></colgroup>
<colgroup span="4"></colgroup>
- <colgroup span="3"></colgroup>
+ <colgroup span="2"></colgroup>
<colgroup span="2"></colgroup>
<tr>
<th colspan="4" scope="colgroup">Seminar Topik</th>
<th colspan="4" scope="colgroup">Seminar Proposal</th>
- <th colspan="3" scope="colgroup">Seminar Tesis</th>
+ <th colspan="2" scope="colgroup">Seminar Tesis</th>
<th colspan="2" scope="colgroup">Sidang Tesis</th>
</tr>
<tr>
@@ -60,7 +68,7 @@
<th scope="col">Siap Seminar Proposal</th>
<th scope="col">Lulus Seminar Proposal</th>
- <th scope="col">Masa Bimbingan</th>
+ {{--<th scope="col">Masa Bimbingan</th>--}}
<th scope="col">Siap Seminar Tesis</th>
<th scope="col">Lulus Seminar Tesis</th>
@@ -74,12 +82,16 @@
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td height="47.2" class="done"></td>
+ @if($item->t_topik1 == null)
+ <td height="46.22" width="110" class="done-rekap"></td>
+ @else
+ <td height="46.22" width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_topik1))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_MENUNGGU_TOPIK ||
$item->status == \App\Mahasiswa::STATUS_TOPIK_DITOLAK)
- <td height="47.2" class="doing"></td>
+ <td height="46.22" width="110" class="doing"></td>
@else
- <td height="47.2" ></td>
+ <td height="46.22" width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_TOPIK_DITERIMA ||
@@ -87,11 +99,16 @@
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+ @if($item->t_topik2 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_topik2))}}</td>
+ @endif
+
@elseif($item->status == \App\Mahasiswa::STATUS_TOPIK_TELAH_DIAJUKAN)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK ||
@@ -99,115 +116,186 @@
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_topik3 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_topik3))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_TOPIK_DITERIMA)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK ||
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_topik4 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_topik4))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK ||
$item->status == \App\Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN ||
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_proposal1 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_proposal1))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_MENUNGGU_PROPOSAL)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_proposal2 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_proposal2))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN ||
$item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_proposal3 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_proposal3))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_PROPOSAL_DITERIMA)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
+
+ @if($item->t_proposal4 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_proposal4))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
- @if($item->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN ||
- $item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
- @elseif($item->status == \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL)
- <td class="doing"></td>
- @else
- <td></td>
- @endif
+ {{--@if($item->status >= \App\Mahasiswa::STATUS_MASA_BIMBINGAN ||--}}
+ {{--$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)--}}
+ {{--<td class="done"></td>--}}
+ {{--@elseif($item->status == \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL)--}}
+ {{--<td class="doing"></td>--}}
+ {{--@else--}}
+ {{--<td></td>--}}
+ {{--@endif--}}
@if($item->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="done"></td>
- @elseif($item->status == \App\Mahasiswa::STATUS_MASA_BIMBINGAN)
- <td class="doing"></td>
+
+ @if($item->t_seminar1 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_seminar1))}}</td>
+ @endif
+ @elseif($item->status == \App\Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL ||
+ $item->status == \App\Mahasiswa::STATUS_MASA_BIMBINGAN)
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
- <td class="done"></td>
+ @if($item->t_seminar2 == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_seminar2))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS ||
$item->status == \App\Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
- <td class="done"></td>
+ @if($item->t_sidang == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_sidang))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
@if($item->status >= \App\Mahasiswa::STATUS_LULUS)
- <td class="done"></td>
+ @if($item->t_lulus == null)
+ <td width="110" class="done-rekap"></td>
+ @else
+ <td width="110" class="done-rekap">{{date('d-m-Y',strtotime($item->t_lulus))}}</td>
+ @endif
@elseif($item->status == \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
- <td class="doing"></td>
+ <td width="110" class="doing"></td>
@else
- <td></td>
+ <td width="110"></td>
@endif
</tr>
@endforeach
</table>
- </div>
-
+ </div>
</div>
</div>
+@endsection
+
+@section('bottomjs')
+ <script>
+ var scrollDuration = 400;
+
+ var leftPaddle = document.getElementsByClassName('left-btn');
+ var rightPaddle = document.getElementsByClassName('right-btn');
+ var menuWrapperSize = 700;
+
+ var menuSize = 1400;
+ // get how much of menu is invisible
+ var menuInvisibleSize = menuSize - menuWrapperSize;
+
+ // scroll to left
+ $(rightPaddle).on('click', function() {
+ $('.progress-mhs').animate( { scrollLeft: menuInvisibleSize}, scrollDuration);
+ });
+
+ // scroll to right
+ $(leftPaddle).on('click', function() {
+ $('.progress-mhs').animate( { scrollLeft: '0' }, scrollDuration);
+ });
+ </script>
@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 70c524b27aee024285aa652738e10ed30147dff7..5f09abfd0cec00212590e661360690899a112c7f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -44,6 +44,7 @@ Route::get('/mahasiswa/control','ManajerController@controlMahasiswa');
Route::get('/mahasiswa/control/{id}','ManajerController@detailControlMahasiswa');
Route::get('/mahasiswa/rekap','RekapDataController@showRekapMahasiswa');
Route::get('/mahasiswa/nilaiakhir','RekapDataController@showRekapNilaiAkhir');
+Route::get('/mahasiswa/history','RekapDataController@showHistoryMahasiswa');
Route::get('/kelastesis','KelasTesisController@showKelasTesis');
Route::post('/kelastesis/tambah','KelasTesisController@tambahKelasTesis');
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index 02afd0fbf506d3dcf9cf01d19357758dfe068b8a..009989f74331a53239807c7d1cb1286c1949d47c 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -45,7 +45,7 @@ class ExampleTest extends TestCase
$this->assertEquals(200, $response->getStatusCode());
- //register admin
+// //register admin
// $response = $this->get('/register');
// $response->assertStatus(200);
//