Skip to content

S
simpmw
Commit 9ac8603a by Alfiro Pratama
Options

Review Logbook, laporan kemajuan, laporan lainnya by operator

parent 5629fab6
Showing with 29 additions and 9 deletions
app/Http/Controllers/Operator/DaftarProposalController.php
......@@ -290,7 +290,7 @@ class DaftarProposalController extends Controller
$aksi .= '
<div class="modal fade" id="proposalModal' . $proposal_id . '" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Proposal</h5>
......
app/Http/Controllers/Operator/MonevProposalController.php
......@@ -108,6 +108,11 @@ class MonevProposalController extends Controller
$data_arr = array();
$path = [
'07cda89b-94ca-42a3-a197-8fc1260ebcfb' => 'monev/I',
'21a49a70-33bb-49f1-9fd9-ebe52fa4336c' => 'monev/II'
];
foreach($records as $record){
$proposal_id = $record->proposal_id;
$monev_internal_id = $record->monev_internal_id;
......@@ -125,6 +130,9 @@ class MonevProposalController extends Controller
$reviewer_id_2 = $record->reviewer_id_2;
$status_final = $record->status;
$rata = $record->rata;
$logbook = is_null($record->logbook_file) ? '<span class="badge bg-danger">File logbook belum diunggah</span>' : '<a href="https://statik.unesa.ac.id/simpmw/'.$path[$record->jenis_monev_id].'/logbook/'.$record->logbook_file.'" class="btn btn-primary btn-sm waves-effect waves-light" role="button" target="_blank">Review <i class="fas fa-search"></i></a>';
$laporan_kemajuan = is_null($record->kemajuan_file) ? '<span class="badge bg-danger">File laporan kemajuan belum diunggah</span>' : '<a href="https://statik.unesa.ac.id/simpmw/'.$path[$record->jenis_monev_id].'/kemajuan/'.$record->kemajuan_file.'" class="btn btn-primary btn-sm waves-effect waves-light" role="button" target="_blank">Review <i class="fas fa-search"></i></a>';
$laporan_luaran = '<a href="' . route('reviewer.luaran-reviewer', encrypt($record->proposal_id)) . '" class="btn btn-primary btn-sm waves-effect waves-light" role="button" target="_blank">Review <i class="fas fa-search"></i></a>';
$video = DaftarProposalMonev::where('proposal_id', $proposal_id)
->where('monev_internal_id', $monev_internal_id)
->pluck('url');
......@@ -199,7 +207,7 @@ class MonevProposalController extends Controller
$url = 'https://statik.unesa.ac.id/simpmw/proposal/'. $record->periode .'/'. $record->upload_dokumen;
$aksi .= '
<div class="modal fade" id="proposalModal' . $proposal_id . '-' . $monev_internal_id . '" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Proposal</h5>
......@@ -234,7 +242,7 @@ class MonevProposalController extends Controller
<th>Video Produk</th>
<td>';
foreach ($video as $item) {
if ($item&& preg_match('/(http|https|www.|\.com|\.co.id|\.org)/i', $item)) {
if ($item && preg_match('/(http|https|www.|\.com|\.co.id|\.org)/i', $item)) {
$aksi .= '<button id="preview-video' . $proposal_id . '" class="btn btn-success btn-sm" data-video="' . $item . '">
<i class="far fa-eye"></i> Lihat Video
</button>';
......@@ -246,6 +254,18 @@ class MonevProposalController extends Controller
}
$aksi .= '</td>
</tr>
<tr>
<th>Logbook</th>
<td>' . $logbook . '</td>
</tr>
<tr>
<th>Laporan Kemajuan</th>
<td>' . $laporan_kemajuan . '</td>
</tr>
<tr>
<th>Laporan Lainnya</th>
<td>' . $laporan_luaran . '</td>
</tr>
</table>
</div>
</div>
......@@ -273,7 +293,7 @@ class MonevProposalController extends Controller
videoUrl = videoUrl.split('&')[0];
}
if (isValidYouTubeUrl(videoUrl)) {
var currentModal = $('#proposalModal" . $proposal_id . "');
var currentModal = $('#proposalModal" . $proposal_id . "-" . $monev_internal_id . "');
$.magnificPopup.open({
items: {
src: videoUrl
......
app/Http/Controllers/Operator/ProposalController.php
......@@ -140,7 +140,7 @@ class ProposalController extends Controller
// Modal lihat proposal
$aksi .= '
<div class="modal fade" id="proposalModal' . $record->id . '" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Proposal</h5>
......
resources/views/backend/operator/daftar_proposal/index.blade.php
......@@ -80,7 +80,7 @@
</div>
<br>
<div class="table-responsive">
<table id="example" class="table table-bordered dt-responsive wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<table id="example" class="table table-bordered wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead style="text-align: center; vertical-align: middle">
<tr>
<th> id</th>
......@@ -90,7 +90,7 @@
<th width='10%'>Dosen Pembimbing</th>
<th width='15%'>Reviewer 1</th>
<th width='15%'>Reviewer 2</th>
<th width='5%' >Pendanaan</th>
<th width='5%'>Pendanaan</th>
<th width='5%'>Nilai Akhir</th>
<th width='10%'>Aksi</th>
</tr>
......
resources/views/backend/operator/daftar_proposal/monev.blade.php
......@@ -81,7 +81,7 @@
</div>
<br>
<div class="table-responsive">
<table id="example" class="table table-bordered dt-responsive wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<table id="example" class="table table-bordered wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead align="center" style="vertical-align: middle;">
<tr>
<th rowspan="2">id</th>
......
resources/views/backend/operator/proposal/index.blade.php
......@@ -77,7 +77,7 @@
</div>
<br>
<div class="table-responsive">
<table id="example" class="table table-bordered dt-responsive wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<table id="example" class="table table-bordered wrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead>
<tr>
<th>No</th>
......
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