diff --git a/app/Http/Controllers/DosenController.php b/app/Http/Controllers/DosenController.php
index 269bbf5a8a38db908d17d370dee5426ba12c8f39..16110ee18648ce369f3093e9743c69e48a85bc36 100644
--- a/app/Http/Controllers/DosenController.php
+++ b/app/Http/Controllers/DosenController.php
@@ -31,8 +31,14 @@ class DosenController extends Controller
if(Auth::user()->isDosen()) {
$iddosen = Auth::user()->id;
$idmahasiswabimbingan = Thesis::where('dosen_pembimbing1', $iddosen)->orWhere('dosen_pembimbing2', $iddosen)->pluck('mahasiswa_id');
- $mahasiswabimbingan = Mahasiswa::whereIn('id',$idmahasiswabimbingan)->get();
- $mahasiswakelas = Mahasiswa::where('status','>=',14)->get();
+ $mahasiswabimbingan = Mahasiswa::join('users','users.id','=','mahasiswas.id')
+ ->whereIn('mahasiswas.id',$idmahasiswabimbingan)
+ ->orderBy('users.username','asc')
+ ->get();
+ $mahasiswakelas = Mahasiswa::join('users','users.id','=','mahasiswas.id')
+ ->where('status','>=',14)
+ ->orderBy('users.username','asc')
+ ->get();
//$kelas = KelasTesis::orderByRaw('updated_at - created_at DESC')->first();
$kelas = KelasTesis::where('id_dosen_kelas',$iddosen)->get();
return view('dosen.index', ['mahasiswabimbingan' => $mahasiswabimbingan, 'mahasiswakelas' => $mahasiswakelas, 'kelas' =>$kelas]);
diff --git a/app/Http/Controllers/KelasTesisController.php b/app/Http/Controllers/KelasTesisController.php
index b8a9b6722bcc40dc212e3bdaae4970f9706cf95c..ef4b941d064c42668e91fb6d2deb057ae6e6ab0f 100644
--- a/app/Http/Controllers/KelasTesisController.php
+++ b/app/Http/Controllers/KelasTesisController.php
@@ -42,15 +42,15 @@ class KelasTesisController extends Controller
$tahun = null;
if(idate("m") > 6){
if($data['semester'] == 1){
- $tahun = idate("Y");
+ $tahun = $data['tahun'];
}else{
- $tahun = idate("Y")+1;
+ $tahun = $data['tahun']+1;
}
}else{
if($data['semester'] == 1){
- $tahun = idate("Y")-1;
+ $tahun = $data['tahun']-1;
}else{
- $tahun = idate("Y");
+ $tahun = $data['tahun'];
}
}
$kelas_tesis = KelasTesis::create([
diff --git a/app/Http/Controllers/ManajerController.php b/app/Http/Controllers/ManajerController.php
index f9a6aa6bc827c68a8aba3d1ee0553495eebea68e..d658b072acefeef983f6d7ff98c95119bfbf5e39 100644
--- a/app/Http/Controllers/ManajerController.php
+++ b/app/Http/Controllers/ManajerController.php
@@ -35,7 +35,13 @@ class ManajerController extends Controller
public function controlMahasiswa() {
$manajer = $this->getManajer();
if($manajer) {
- $mahasiswa = Mahasiswa::where('status', '!=', Mahasiswa::STATUS_NOT_ACTIVE)->get();
+ $mahasiswa = Mahasiswa::join('users','users.id','=','mahasiswas.id')
+ ->select('users.username','mahasiswas.*')
+ ->where('status', '!=', Mahasiswa::STATUS_NOT_ACTIVE)
+ ->where('status', '!=', Mahasiswa::STATUS_LULUS)
+ ->orderBy('users.username','asc')
+ ->get();
+
return view('manajer.mahasiswa_control', ['mahasiswa' => $mahasiswa]);
} else {
abort(403);
diff --git a/app/Http/Controllers/PenjadwalanController.php b/app/Http/Controllers/PenjadwalanController.php
index b713cf6eca46e278b964bf2bbe9c125c38a0886b..5ddabd105fe6dfc1b3524d3ca3643d9d78ef4975 100644
--- a/app/Http/Controllers/PenjadwalanController.php
+++ b/app/Http/Controllers/PenjadwalanController.php
@@ -25,7 +25,11 @@ class PenjadwalanController extends Controller
public function showPenjadwalanPage(){
$manajer = Auth::user()->isManajer();
if($manajer) {
- $seminar_topik = SeminarTopik::orderBy('topik_id','asc')->orderBy('created_at','desc')->get();
+ $seminar_topik = SeminarTopik::join('users','users.id','=','seminar_topiks.mahasiswa_id')
+ ->select('users.username','seminar_topiks.*')
+ ->orderBy('users.username','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,9 +42,23 @@ class PenjadwalanController extends Controller
// })->get();
//error_log(count($proposal));
- $seminar_proposal = SeminarProposal::orderBy('proposal_id','asc')->orderBy('created_at','desc')->get();
- $seminar_tesis = SeminarTesis::get();
- $sidang_tesis = SidangTesis::get();
+ $seminar_proposal = SeminarProposal::join('users','users.id','=','seminar_proposals.mahasiswa_id')
+ ->select('users.username','seminar_proposals.*')
+ ->orderBy('users.username','asc')
+ ->orderBy('created_at','desc')
+ ->get();
+ $seminar_tesis = SeminarTesis::join('thesis','thesis.id','=','seminar_teses.tesis_id')
+ ->join('users','users.id','=','thesis.mahasiswa_id')
+ ->select('users.username','seminar_teses.*')
+ ->orderBy('users.username','asc')
+ ->orderBy('created_at','desc')
+ ->get();
+ $sidang_tesis = SidangTesis::join('thesis','thesis.id','=','sidang_tesis.thesis_id')
+ ->join('users','users.id','=','thesis.mahasiswa_id')
+ ->select('users.username','sidang_tesis.*')
+ ->orderBy('users.username','asc')
+ ->orderBy('created_at','desc')
+ ->get();
return view('manajer.penjadwalan',['topik' => $topik,
'proposal' => $proposal,
diff --git a/app/Http/Controllers/RekapDataController.php b/app/Http/Controllers/RekapDataController.php
index ca7a40e5ef8748786f85ea32f9c3c5eb89531b5b..f1bd4c12cc17e7a8edf5fc6073beb8a01cba00fa 100644
--- a/app/Http/Controllers/RekapDataController.php
+++ b/app/Http/Controllers/RekapDataController.php
@@ -33,7 +33,11 @@ class RekapDataController extends Controller
public function showRekapNilaiAkhir(){
$manajer = Auth::user()->isManajer();
if($manajer){
- $sidang_tesis = SidangTesis::get();
+ $sidang_tesis = SidangTesis::join('thesis','thesis.id','=','sidang_tesis.thesis_id')
+ ->join('users','users.id','=','thesis.mahasiswa_id')
+ ->select('users.username','sidang_tesis.*')
+ ->orderBy('users.username','asc')
+ ->get();
$mahasiswa = Mahasiswa::get();
return view('manajer.nilai_akhir_mahasiswa',['sidang_tesis' => $sidang_tesis]);
}else{
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index 1c12ff1d65d63ae2d7d2a7e066ab97805565c877..912b3e7fc1a48d196b56c91bd288227e2fa8294c 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -199,7 +199,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()->judul_thesis}}">
+ <input type="text" id="judul" name="judul" class="col-md-8 form-control new-input" value="{{$mahasiswa->tesis()->judul_thesis}}">
</div>
@@ -208,28 +208,28 @@
<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}}" >
+ <input type="date" id="haritgl" name="haritgl" class="col-md-8 form-control new-input" 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}}">
+ <input type="time" id="haritgl" name="waktu" class="col-md-8 form-control new-input" 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}}">
+ <input type="string" id="tempat" name="tempat" class="col-md-8 form-control new-input" 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="usulan_penguji1" class="form-control col-md-8" id="">
+ <select name="usulan_penguji1" class="form-control col-md-8 new-input" id="">
<option></option>
@foreach(App\Dosen::getListDosenPenguji() as $item)
@if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2)
@@ -250,7 +250,7 @@
<label for="tempat" class="col-md-4 col-form-label text-md-right text-center">
Usulan Dosen Penguji
</label>
- <select name="usulan_penguji2" class="form-control col-md-8" id="">
+ <select name="usulan_penguji2" class="form-control col-md-8 new-input" id="">
<option></option>
@foreach(App\Dosen::getListDosenPenguji() as $item)\
@if($item->id != $tesis->dosen_pembimbing1 and $item->id != $tesis->dosen_pembimbing2)
@@ -268,12 +268,29 @@
</div>
<div class="row justify-content-center">
- <button class="btn btn-blue display-flex align-items-center ">
+ <script type="text/javascript">
+ function enableAllNewInput() {
+ $(".new-input").removeAttr("disabled");
+ $("#edit-new-data").css("display", "none");
+ $("#save-new-data").css("display", "block");
+ }
+ window.onload = function() {
+ $(".new-input").attr("disabled",true);
+ $("#edit-new-data").click(enableAllNewInput);
+ };
+ </script>
+ <button type="button" id="edit-new-data" class="btn btn-blue align-items-center ">
<i class="material-icons font-size-18-px">
edit
</i>
Edit
</button>
+ <button style="display: none" type="submit" id="save-new-data" class="btn btn-blue align-items-center ">
+ <i class="material-icons font-size-18-px">
+ save
+ </i>
+ Save
+ </button>
</div>
</form>
</div>
diff --git a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
index facee577209e0b7b0fbc55906a9c628db70decb2..ddb14f19af1b1af93209760c78119642ea3e061d 100644
--- a/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
+++ b/resources/views/mahasiswa/daftar_sidang_tesis.blade.php
@@ -2,6 +2,7 @@
@section('title','Pendaftaran Sidang Tesis')
@php($user = Auth::user());
@php($sidangTesis = $user->isMahasiswa()->tesis()->sidangTesis())
+@php($seminarTesis = $user->isMahasiswa()->tesis()->seminarTesis())
@section('content')
<div class="container">
@if(isset($success))
@@ -23,12 +24,10 @@
<input type="text" id="semester_daftar" name="semester_daftar" class="form-control col-md-8 " value="{{$sidangTesis->semester_terdaftar}}" required>
</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>
+ <label for="tanggal_seminar_tesis" class="col-md-4 col-form-label text-md-right text-center">Waktu Seminar Tesis</label>
<input type="datetime-local" id="tanggal_seminar_tesis" name="tanggal_seminar_tesis" class="form-control col-md-8 "
- @if($sidangTesis->jadwal_seminar)
- value="{{date("Y-m-d\TH:i:s", strtotime($sidangTesis->jadwal_seminar))}}"
- @endif
- required>
+ value="{{date("Y-m-d H:i:s", strtotime("$seminarTesis->hari $seminarTesis->waktu"))}}"
+ required disabled>
</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>
diff --git a/resources/views/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index 75e2b4ecd167db19f8124848f6d65956769ca798..6f3e434fc429dd92832e504d51cc0240a93b88d5 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -76,7 +76,7 @@
</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))
+ @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>
@@ -87,7 +87,7 @@
</li>
@endif
- @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
+ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#sidangtesis">Sidang Tesis</a>
</li>
@@ -466,8 +466,9 @@
<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">
- <div>
+ <div class="form-group row mt-2">
+ <label for="name" class="col-md-4 col-form-label text-md-right">Jadwal Seminar Proposal</label>
+ <div class="col-md-6">
<input type="datetime-local" class="form-control" name="date"
@if($seminarProposal)
value="{{date("Y-m-d\TH:i:s", strtotime($seminarProposal->schedule))}}"
@@ -489,7 +490,8 @@
@endif
>{{$user_item->name}}</option>
@endforeach
- @else
+ @endif
+ @else
@foreach(\App\Dosen::getListDosenPembimbing1() as $item)
@php($user_item = $item->user)
<option value="{{$user_item->id}}"
@@ -498,8 +500,8 @@
@endif
>{{$user_item->name}}</option>
@endforeach
- @endif
@endif
+
</select>
</div>
</div>
@@ -507,7 +509,7 @@
<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)
@if($seminarProposal->dosen_pembimbing_2)
<option value="">
</option>
@@ -519,7 +521,8 @@
@endif
>{{$user_item->name}}</option>
@endforeach
- @else
+ @endif
+ @else
<option value="">
</option>
@foreach(\App\Dosen::getListDosenPembimbing2() as $item)
@@ -530,8 +533,8 @@
@endif
>{{$user_item->name}}</option>
@endforeach
- @endif
- @endif
+ @endif
+
</select>
</div>
</div>
@@ -541,7 +544,7 @@
<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)
+ @if($seminarProposal)
@if($seminarProposal->dosen_penguji)
@foreach(\App\Dosen::getListDosenPenguji() as $item)
@php($user_item = $item->user)
@@ -551,19 +554,20 @@
@endif
>{{$user_item->name}}</option>
@endforeach
- @else
+ @endif
+ @else
@foreach(\App\Dosen::getListDosenPenguji() as $item)
@php($user_item = $item->user)
<option value="{{$user_item->id}}"
>{{$user_item->name}}</option>
@endforeach
- @endif
- @endif
+ @endif
+
</select>
</div>
</div>
- <div class="row">
+ <div class="row justify-content-center">
<button class="btn btn-blue ml-4">
Tetapkan
</button>
@@ -805,10 +809,8 @@
</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"
-
- >
+ <input type="checkbox" class="form-check-input" id="cb2" name="check-seminar-dengan-teman" @if($seminarTesis->sidang_dengan_teman) checked @endif>
+ <label for="cb2" class="form-check-label">
Bukti (Fotokopi) telah seminar dengan teman diserahkan ke TU
</label>
</div>
@@ -1656,13 +1658,13 @@
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))
+ @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)
+ @elseif($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS)
<script>
var temp = document.getElementById("sidangtesis");
temp.classList.remove('fade');
diff --git a/resources/views/manajer/kelas_tesis.blade.php b/resources/views/manajer/kelas_tesis.blade.php
index 5e022cad55a493bf9cc91d93e025e15c4129ef5b..a4002b54674aae3c345b30dfc49d822eaa11af0a 100644
--- a/resources/views/manajer/kelas_tesis.blade.php
+++ b/resources/views/manajer/kelas_tesis.blade.php
@@ -33,9 +33,12 @@
<option value=""> </option>
@if(idate("m") > 6)
<option value="{{idate("Y")}}">{{idate("Y")}}/{{idate("Y")+1}}</option>
+ <option value="{{idate("Y")+1}}">{{idate("Y")+1}}/{{idate("Y")+2}}</option>
@else
<option value="{{idate("Y")}}">{{idate("Y")-1}}/{{idate("Y")}}</option>
+ <option value="{{idate("Y")+1}}">{{idate("Y")}}/{{idate("Y")+1}}</option>
@endif
+
</select>
</td>
<td>