Commit a31b20fa by Novan Bagus Setiawan

perbaikan monev disisi dosen reviewer

parent 3734f95c
......@@ -16,7 +16,9 @@ use App\Models\Reviewer;
use App\Models\JenisMonev;
use Illuminate\Http\Request;
use App\Models\ReviewerMonev;
use App\Models\DaftarProposal;
use App\Models\JadwalKegiatan;
use App\Models\ProposalLuaran;
use Illuminate\Support\Carbon;
use App\Models\ReviewerProposal;
use App\Models\ReviewerMonevDetil;
......@@ -92,20 +94,31 @@ class DaftarMonevController extends Controller
foreach($records as $record){
$monev_internal_id = $record->monev_internal_id;
$proposal_id = $record->proposal_id;
$jenis_id = $record->jenis_id;
$kode = $record->kode;
$jenis_pkm = $record->jenis_pkm;
$judul = $record->judul;
$nilai_1= $record->nilai_1;
$nilai_2 = $record->nilai_2;
$folder= $record->folder;
$upload_dokumen = $record->upload_dokumen;
$upload_logbook = $record->upload_logbook;
$identitas_ketua = str_replace('###', '<br>', $record->identitas_ketua);
$identitas_dospem = str_replace('###', '<br>', $record->identitas_dospem);
$logbook = '<a href="#" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Review <i class="fas fa-search"></i></a>';
$laporan_kemajuan = '<a href="#" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Review <i class="fas fa-search"></i></a>';
$laporan_luaran = '<a href="#" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Review <i class="fas fa-search"></i></a>';
$url_logbook = "https://statik.unesa.ac.id/simpkm/monev/".$folder."/logbook"."/".$upload_logbook;
$url_kemajuan = "https://statik.unesa.ac.id/simpkm/monev/".$folder."/kemajuan"."/".$upload_dokumen;
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$record->periode."/".$record->upload_dokumen;
$url_luaran = URL::to("reviewer/monev-internal-luaran/".Crypt::encrypt($proposal_id));
$logbook = $laporan_kemajuan = '<span class="badge bg-danger">Belum Diunggah.</span>';
if(isset($upload_logbook))
$logbook = '<a href="#" target="_blank" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Lihat <i class="fas fa-search"></i></a>';
if(isset($upload_dokumen))
$laporan_kemajuan = '<a href="'.$url_kemajuan.'" target="_blank" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Lihat <i class="fas fa-search"></i></a>';
$laporan_luaran = '<a href="'.$url_luaran.'" class="btn btn-primary btn-sm waves-effect waves-light" role="button">Lihat <i class="fas fa-search"></i></a>';
$urut = DB::select("select ambil_data_reviewer_monev('".$this->rBiodata->noidentitas."', '".$monev_internal_id."', '1')")[0]->ambil_data_reviewer_monev;
......@@ -113,7 +126,6 @@ class DaftarMonevController extends Controller
$status_administrasi = DB::select("select ambil_data_reviewer_monev('".$this->rBiodata->noidentitas."', '".$monev_internal_id."', '3')")[0]->ambil_data_reviewer_monev;
$proposal = '<a href="'.$url.'" target="_blank" class="btn btn-primary btn-sm waves-effect waves-light" role="button"><i class="fas fa-search"></i></a>';
if($status_nilai > 0 ||$status_administrasi == '2')
$status = '<span class="badge bg-success">Sudah dinilai</span>';
else
......@@ -207,7 +219,16 @@ class DaftarMonevController extends Controller
public function show($id)
{
$reqId = decrypt($id);
$luaran = ProposalLuaran::where('proposal_id', $reqId)->get();
$proposal = DaftarProposal::where('proposal_id', $reqId)->first();
$data = [
'luaran'=> $luaran,
'proposal'=> $proposal,
];
return view('backend.reviewer.monev.luaran', compact('data'))->withTitle('Data Luaran');
}
public function edit($id)
......
@extends('layouts.master')
@section('title')
Dashboard
@endsection
@section('header')
<div class="page-title">
<h3>Dashboard</h3>
</div>
@endsection
@section('contents')
<!-- start page title -->
<div class="page-title-box">
<div class="row align-items-center">
<div class="col-md-8">
<h6 class="page-title">{!! $title !!}</h6>
<ol class="breadcrumb m-0">
<li class="breadcrumb-item">Monev Internal</li>
<li class="breadcrumb-item">Luaran Kelompok <b>{{ $data['proposal']->kode }}</b></li>
</ol>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-body">
<h4 class="card-title">{!! $title !!}</h4>
<p class="card-title-desc"></p>
<div class="row mb-3">
<label for="kode" class="col-sm-2 col-form-label">Judul</label>
<div class="col-sm-10">
<span>{{ $data['proposal'] ? $data['proposal']->judul : '' }}</span>
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label>
<div class="col-sm-10">
<span>{{ $data['proposal'] ? $data['proposal']->jenis_pkm : '' }}</span>
</div>
</div>
<div class="row mb-3">
<label for="kode" class="col-sm-2 col-form-label">Luaran : </label>
<div class="col-sm-10">
<table class="table table-striped">
<thead>
<tr style="text-align: center">
<th style="width: 20%">Jenis</th>
<th style="width: 70%">Judul</th>
<th style="width: 10%">File</th>
</tr>
</thead>
<tbody>
@foreach ($data['luaran'] as $res => $val)
<tr>
<th>{{ $val->jenis_luaran }}</th>
<th>{{ $val->judul }}</th>
<th><a href="https://statik.unesa.ac.id/simpkm/luaran/{{ $val->jenis_luaran }}/{{ $val->file_luaran }}" target="_blank" class="btn btn-primary btn-sm waves-effect waves-light" role="button"> <i class="fas fa-search"></i> Lihat</a> </th>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
</div> <!-- end col -->
</div> <!-- end row -->
@endsection
@section('js')
<script>
</script>
@endsection
......@@ -220,6 +220,7 @@ Route::group(['middleware' => ['auth:sanctum', 'verified']], function () {
Route::get('getDaftarSeleksi', [DaftarSeleksiController::class, 'getData'])->name('getDaftarSeleksi');
Route::get('monev-internal/{id}', [DaftarMonevController::class, 'index'])->name('monev-internal');
Route::get('monev-internal-luaran/{id}', [DaftarMonevController::class, 'show'])->name('monev-internal-luaran');
Route::resource('monev-internal', DaftarMonevController::class)->except(['index']);
Route::get('getDaftarMonev', [DaftarMonevController::class, 'getData'])->name('getDaftarMonev');
});
......
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