Commit ee952692 by novanbagus

perbaikan monev internal sesuai dengan jadwal

parent c25683fd
...@@ -16,6 +16,7 @@ use App\Models\Reviewer; ...@@ -16,6 +16,7 @@ use App\Models\Reviewer;
use App\Models\JenisMonev; use App\Models\JenisMonev;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\ReviewerMonev; use App\Models\ReviewerMonev;
use App\Models\JadwalKegiatan;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use App\Models\ReviewerProposal; use App\Models\ReviewerProposal;
use App\Models\ReviewerMonevDetil; use App\Models\ReviewerMonevDetil;
...@@ -42,8 +43,10 @@ class DaftarMonevController extends Controller ...@@ -42,8 +43,10 @@ class DaftarMonevController extends Controller
public function index($id) public function index($id)
{ {
$jenis_monev = JenisMonev::select('nama')->where('jenis_monev_id', Crypt::decrypt($id))->first(); $jenis_monev = JenisMonev::select('nama')->where('jenis_monev_id', Crypt::decrypt($id))->first();
$jadwal = JadwalKegiatan::where('periode_id', DaftarMonevController::periode_id)->where('nama',$jenis_monev->nama)->first();
$data = [ $data = [
'id'=> $id 'id'=> $id,
'jadwal'=> $jadwal,
]; ];
return view('backend.reviewer.monev.index', compact('data'))->withTitle($jenis_monev->nama); return view('backend.reviewer.monev.index', compact('data'))->withTitle($jenis_monev->nama);
} }
......
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<h3>Dashboard</h3> <h3>Dashboard</h3>
</div> </div>
@endsection @endsection
@php
$jadwal = $data['jadwal'];
@endphp
@section('contents') @section('contents')
<!-- start page title --> <!-- start page title -->
...@@ -31,25 +34,30 @@ ...@@ -31,25 +34,30 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<table id="example" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> @if((($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) || $jadwal->tanggal_mulai <= Carbon\Carbon::now())
<thead> <table id="example" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<tr> <thead>
<th>id</th> <tr>
<th>Kode Kelompok</th> <th>id</th>
<th>Identitas Ketua</th> <th>Kode Kelompok</th>
<th>Identitas <br>Dosen Pembimbing</th> <th>Identitas Ketua</th>
<th>Jenis <br>PKM</th> <th>Identitas <br>Dosen Pembimbing</th>
<th>Judul Proposal</th> <th>Jenis <br>PKM</th>
<th>Catatan Harian <br>(Logbook)</th> <th>Judul Proposal</th>
<th>Laporan <br>Kemajuan</th> <th>Catatan Harian <br>(Logbook)</th>
<th>Laporan <br>Luaran</th> <th>Laporan <br>Kemajuan</th>
<th>Nilai</th> <th>Laporan <br>Luaran</th>
</tr> <th>Nilai</th>
</thead> </tr>
<tbody> </thead>
</tbody> <tbody>
</table> </tbody>
</table>
@else
<div class="alert alert-success alert-dismissible fade show" role="alert">
<strong>Informasi!</strong> {!! $title !!} dilaksanakan pada : <strong>Tanggal {{ Carbon\Carbon::parse($jadwal->tanggal_mulai)->isoFormat('D MMMM Y HH:mm:ss'); }}</strong> sampai dengan <strong>Tanggal {{ Carbon\Carbon::parse($jadwal->tanggal_selesai)->isoFormat('D MMMM Y HH:mm:ss'); }}.</strong>
</div>
@endif
</div> </div>
</div> </div>
</div> <!-- end col --> </div> <!-- end col -->
......
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