Commit 48137462 by Farendi Giotivano R.P

seleksi internal

parent 2bb855e5
...@@ -32,7 +32,7 @@ class ProposalController extends Controller ...@@ -32,7 +32,7 @@ class ProposalController extends Controller
$periode = Periode::query()->get(); $periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year; $year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis', 'rDaftarPro'])
->whereHas('rKelompok', function ($query) use($bio){ ->whereHas('rKelompok', function ($query) use($bio){
$query->where('nidn_dosen', $bio->noidentitas); $query->where('nidn_dosen', $bio->noidentitas);
}) })
......
...@@ -28,7 +28,7 @@ class SeleksiController extends Controller ...@@ -28,7 +28,7 @@ class SeleksiController extends Controller
$periode = Periode::query()->get(); $periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year; $year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis', 'rDaftarPro'])
->whereHas('rKelompok', function ($query) use($bio){ ->whereHas('rKelompok', function ($query) use($bio){
$query->where('nidn_dosen', $bio->noidentitas); $query->where('nidn_dosen', $bio->noidentitas);
}) })
......
...@@ -93,5 +93,9 @@ class Proposal extends Model ...@@ -93,5 +93,9 @@ class Proposal extends Model
return $this->hasOne(VDaftarMonev::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']); return $this->hasOne(VDaftarMonev::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']);
} }
public function rDaftarPro()
{
return $this->hasOne(DaftarProposal::class, 'proposal_id', 'proposal_id');
}
} }
...@@ -76,7 +76,9 @@ ...@@ -76,7 +76,9 @@
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
<td> <td>
@if(is_null($item->status)) @if(is_null($item->rDaftarPro->status_final))
<span class="badge bg-info">Menunggu Reviewer</span>
@elseif($item->rDaftarPro->status_final == 1)
<span class="badge bg-danger">Lolos Seleksi Internal</span> <span class="badge bg-danger">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-success">Tidak Lolos Seleksi Internal</span> <span class="badge bg-success">Tidak Lolos Seleksi Internal</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment