Skip to content

S
simpmw
Commit ad4df270 by Muhammad Iskandar Java
Options

revisi penilaian, input dana admin, show pendanaan seleksi internal

parents 2f12632d 99efbd1b
Showing with 264 additions and 110 deletions
app/Http/Controllers/Dosen/ProposalController.php
......@@ -68,23 +68,34 @@ class ProposalController extends Controller
public function lihat(Request $request)
{
$item['proposal'] = Proposal::where('proposal_id', $request->proposal_id)->first();
$item['url'] = ProposalUrl::where('proposal_id', $request->proposal_id)->all();
$item['url'] = ProposalUrl::where('proposal_id', $request->proposal_id)->get();
$data = '';
$no = 1;
if($item->upload_dokumen){
$dokumen = ' <a href="https://statik.unesa.ac.id/simpmw/proposal/'. $item->rPeriode->nama .'/'. $item->upload_dokumen.'" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>
<iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpmw/proposal/'. $item->rPeriode->nama .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>';
}else{
$link = '';
foreach ($item['url'] as $surel) {
$link .= $surel->url;
}
// $link = 'https://www.tiktok.com/@ringtone_29/video/7347691711562353926?is_from_webapp=1&sender_device=pc';
// dd($link);
if($item['proposal']->upload_dokumen){
$dokumen = '<a href="https://statik.unesa.ac.id/simpmw/proposal/'. $item['proposal']->rPeriode->nama .'/'. $item['proposal']->upload_dokumen.'" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a>';
$url = '<a id="lihat" class="btn btn-success btn-sm" data-video="'. $link .'"><i class="far fa-eye"></i> Lihat Video</a>';
}
else{
$dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan.
</div>';
$url = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan.
</div>';
}
if(is_null($item->status) OR $item->status == '0'){
if(is_null($item['proposal']->status) OR $item['proposal']->status == '0'){
$status = '<span class="badge bg-danger">Menunggu Persetujuan Dosen</span>';
}else{
$status = '<span class="badge bg-success">Sudah Disetujui Dosen</span>';
......@@ -93,11 +104,11 @@ class ProposalController extends Controller
$data .= "
<tr>
<td>Judul Proposal</td>
<td>".$item->judul."</td>
<td>".$item['proposal']->judul."</td>
</tr>
<tr>
<td>Jenis PMW</td>
<td>".$item->rJenis->nama."</td>
<td>Kategori PMW</td>
<td>".$item['proposal']->rJenis->nama."</td>
</tr>
<tr>
<td>Status</td>
......@@ -109,14 +120,13 @@ class ProposalController extends Controller
</tr>
<tr>
<td>Video Produk</td>
<td>".$item['url']->url."</td>
<td>".$url."</td>
</tr>
";
$response['html'] = $data;
echo json_encode($response);
}
public function approve($id)
......
app/Http/Controllers/Dosen/SeleksiController.php
......@@ -108,7 +108,7 @@ class SeleksiController extends Controller
<td>".$item->judul."</td>
</tr>
<tr>
<td>Jenis PMW</td>
<td>Kategori PMW</td>
<td>".$item->jenis_pkm."</td>
</tr>
<tr>
......
app/Http/Controllers/Mahasiswa/ProposalController.php
......@@ -117,6 +117,7 @@ class ProposalController extends Controller
*/
public function store(Request $request)
{
// dd($request->all());
//
$proposal = $request->except('_token');
......@@ -129,8 +130,8 @@ class ProposalController extends Controller
'file.file' => 'File harus berupa file.',
'file.mimes' => 'File harus berupa file PDF.',
'file.max' => 'Ukuran file maksimal adalah 5 MB.',
'jenis.required' => 'Harap pilih jenis PMW.',
'jenis.not_in' => 'Harap pilih jenis PMW yang valid.',
'jenis.required' => 'Harap pilih Kategori PMW.',
'jenis.not_in' => 'Harap pilih Kategori PMW yang valid.',
]);
$periode = Periode::where('status', 1)->first();
......@@ -148,6 +149,7 @@ class ProposalController extends Controller
'judul' => $proposal['judul'],
'status' => '0',
'upload_dokumen' => $file_nama,
'usulan_dana' => $proposal['usulan_dana'],
'date_upload' => now(),
'created_user' => Auth::user()->id
]);
......
app/Http/Controllers/Mahasiswa/SeleksiController.php
......@@ -191,7 +191,7 @@ class SeleksiController extends Controller
<td>".$item->judul."</td>
</tr>
<tr>
<td>Jenis PMW</td>
<td>Kategori PMW</td>
<td>".$item->jenis_pkm."</td>
</tr>
<tr>
......
app/Http/Controllers/Operator/DaftarProposalController.php
......@@ -728,7 +728,7 @@ class DaftarProposalController extends Controller
if ($delete) {
$status = 'success';
$message = "Berhasil ubah Jenis PMW.";
$message = "Berhasil ubah Kategori PMW.";
}
else{
$status = 'error';
......
app/Http/Controllers/Operator/JenisController.php
......@@ -18,7 +18,7 @@ class JenisController extends Controller
{
public function index()
{
return view('backend.operator.jenis.index')->withTitle('Jenis PMW');
return view('backend.operator.jenis.index')->withTitle('Kategori PMW');
}
/* AJAX request */
......@@ -89,7 +89,7 @@ class JenisController extends Controller
public function create()
{
return view('backend.operator.jenis.create')->withTitle('Tambah Jenis PMW');
return view('backend.operator.jenis.create')->withTitle('Tambah Kategori PMW');
}
public function store(Request $request)
......@@ -123,7 +123,7 @@ class JenisController extends Controller
'jenis' => $jenis
];
return view('backend.operator.jenis.edit', compact('data'))->withTitle('Ubah Jenis PMW');
return view('backend.operator.jenis.edit', compact('data'))->withTitle('Ubah Kategori PMW');
}
public function update(Request $request, $id)
......@@ -147,11 +147,11 @@ class JenisController extends Controller
if ($delete == 1) {
$status = 'success';
$message = "Jenis PMW berhasil dihapus.";
$message = "Kategori PMW berhasil dihapus.";
}
else{
$status = 'error';
$message = "Jenis PMW tidak ada.";
$message = "Kategori PMW tidak ada.";
}
return response()->json([
......
app/Http/Controllers/Operator/JenisPenilaianMonevController.php
......@@ -19,7 +19,7 @@ class JenisPenilaianMonevController extends Controller
{
public function index()
{
return view('backend.operator.jenis_penilaian_monev.index')->withTitle('Jenis PMW');
return view('backend.operator.jenis_penilaian_monev.index')->withTitle('Kategori PMW');
}
/* AJAX request */
......@@ -108,7 +108,7 @@ class JenisPenilaianMonevController extends Controller
'jenis_penilaian_monev' => $jenis_penilaian_monev
];
return view('backend.operator.jenis_penilaian_monev.edit', compact('data'))->withTitle('Ubah Jenis PMW');
return view('backend.operator.jenis_penilaian_monev.edit', compact('data'))->withTitle('Ubah Kategori PMW');
}
public function update(Request $request, $id)
......
app/Models/Proposal.php
......@@ -45,7 +45,9 @@ class Proposal extends Model
'laporan_akhir_file',
'laporan_akhir_date',
'laporan_akhir_approval',
'pendanaan'
'pendanaan',
'usulan_dana',
];
public function rKelompok()
......
resources/views/backend/dosen/monev/index.blade.php
......@@ -44,7 +44,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th>
......@@ -83,7 +83,7 @@
<td>{{ $item->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td>{{ $item->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/dosen/monev/indexmonevI.blade.php
......@@ -59,7 +59,7 @@
<th>No</th>
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th>
......@@ -113,7 +113,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/dosen/monev/indexmonevII.blade.php
......@@ -59,7 +59,7 @@
<th>No</th>
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th>
......@@ -113,7 +113,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/dosen/monev/indexmonevIII.blade.php
......@@ -59,7 +59,7 @@
<th>No</th>
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th>
......@@ -117,7 +117,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/dosen/proposal/index.blade.php
......@@ -60,7 +60,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
{{-- <th>Identitas Dosen Pembimbing</th> --}}
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......@@ -123,7 +123,7 @@
</div> <!-- end row -->
<div id="lihatDetail" class="modal fade">
<div class="modal-dialog modal-xl">
<div class="modal-dialog modal-xl modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="lihatLabel">Detail Proposal </h5>
......@@ -222,33 +222,88 @@ function setuju(id, rowId){
})
}
$(document).ready(function(){
$(document).ready(function() {
$('#datatable').on('click','.lihatDet',function(){
var proId = $(this).attr('data-id');
if(proId != null || proId != ''){
// Empty modal data
if (proId != null || proId != '') {
// Kosongkan data modal
$('#tableDetail tbody').empty();
$.ajax({
url: "{{route('dosen.proposal.lihat')}}",
data : {
url: "{{ route('dosen.proposal-lihat') }}",
data: {
"proposal_id": proId,
},
dataType: 'json',
success: function(response){
// Add user details
success: function(response) {
// Tampilkan data di dalam modal
$('#tableDetail tbody').html(response.html);
// Display Modal
// Tampilkan modal
$('#lihatDetail').modal('show');
// Inisialisasi Magnific Popup pada tombol "Lihat Video"
initMagnificPopup();
}
});
}
});
// Fungsi untuk inisialisasi Magnific Popup pada tombol "Lihat Video"
function initMagnificPopup() {
$('#tableDetail').on('click', '#lihat', function() {
var videoUrl = $(this).attr('data-video');
// console.log(videoUrl);
if (videoUrl) {
// Cek jika URL video adalah format youtu.be
if (videoUrl.includes('youtu.be')) {
// Konversi ke format youtube.com/watch?v=xxxxx
videoUrl = videoUrl.replace('youtu.be/', 'youtube.com/watch?v=');
}
// Buka video dalam Magnific Popup jika valid, buka di tab baru jika tidak
if (isValidYouTubeUrl(videoUrl)) {
$.magnificPopup.open({
items: {
src: videoUrl
},
type: 'iframe',
iframe: {
markup: '<div class="mfp-iframe-scaler">'+
'<div class="mfp-close"></div>'+
'<iframe class="mfp-iframe" frameborder="0" allowfullscreen allow="autoplay"></iframe>'+
'</div>'
},
callbacks: {
open: function() {
// Sembunyikan modal lama saat Magnific Popup dibuka
$('#lihatDetail').modal('hide');
},
close: function() {
// Tampilkan kembali modal setelah Magnific Popup ditutup
$('#lihatDetail').modal('show');
}
}
});
} else {
// Buka video di tab baru jika tidak valid
window.open(videoUrl, '_blank');
}
} else {
console.error('URL video tidak valid:', videoUrl);
}
});
}
// Fungsi untuk memeriksa apakah URL video YouTube valid
function isValidYouTubeUrl(url) {
// Lakukan validasi sederhana menggunakan ekspresi reguler
return /^(http(s)?:\/\/)?((w){3}.)?youtu(be|.be)?(\.com)?\/.+/gm.test(url);
}
});
$('body').on('click', '#revPro', function (event) {
......
resources/views/backend/dosen/seleksi/index_belmawa.blade.php
......@@ -60,7 +60,7 @@
<th>No</th>
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......@@ -110,7 +110,7 @@
<td>{{ $item->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td>{{ $item->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/dosen/seleksi/index_internal.blade.php
......@@ -60,7 +60,7 @@
<th>No</th>
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......
resources/views/backend/dosen/seleksi/internal_revisi.blade.php
......@@ -41,7 +41,7 @@
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
<select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option>
......
resources/views/backend/mahasiswa/kelompok/createkel.blade.php
......@@ -74,7 +74,7 @@
@foreach ($kelompok->rAnggota as $item)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $item->nama }}</td>
<td>{{ ucwords(strtolower($item->nama)) }}</td>
<td>{{ $item->nim }}</td>
<td>{{ $item->fakultas }}</td>
<td>{{ $item->prodi }}</td>
......
resources/views/backend/mahasiswa/kelompok/index.blade.php
......@@ -128,7 +128,7 @@
@foreach ($item->rAnggota as $value)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $value->nama }}</td>
<td>{{ ucwords(strtolower($value->nama)) }}</td>
<td>{{ $value->nim }}</td>
<td>{{ $value->fakultas }}</td>
<td>{{ $value->prodi }}</td>
......
resources/views/backend/mahasiswa/monev/index.blade.php
......@@ -44,7 +44,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th>
......@@ -83,7 +83,7 @@
<td>{{ $item->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td>{{ $item->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/mahasiswa/monev/indexmonevI.blade.php
......@@ -60,7 +60,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th>
......@@ -116,7 +116,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/mahasiswa/monev/indexmonevII.blade.php
......@@ -60,7 +60,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th>
......@@ -124,7 +124,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/mahasiswa/monev/indexmonevIII.blade.php
......@@ -60,7 +60,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th>
......@@ -124,7 +124,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/mahasiswa/monev/upload_monev.blade.php
......@@ -41,7 +41,7 @@
<label class="col-sm-10 col-form-label">{{ $proposal->rProposal->judul }}</label>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<label class="col-sm-10 col-form-label">{{ $proposal->rProposal->rJenis->nama }}</label>
</div>
<div class=" row mb-3">
......
resources/views/backend/mahasiswa/proposal/create.blade.php
......@@ -46,7 +46,7 @@
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW<span style="color: red;"> *</span></label>
<label class="col-sm-2 col-form-label">Kategori PMW<span style="color: red;"> *</span></label>
<div class="col-sm-10">
<select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option>
......@@ -83,10 +83,23 @@
<textarea class="form-control" type="text" id="deskripsi" name="deskripsi" placeholder="Deskripsi..." required>{{ old('deskripsi') }}</textarea>
</div>
</div>
<div class="mb-0">
<div class="row mb-3">
<label for="usulan_dana" class="col-sm-2 col-form-label">Usulan Pendanaan<span style="color: red;"> *</span></label>
<div class="col-sm-10 col-lg-10">
<div class="input-group">
<span class="input-group-text">Rp</span>
<input class="form-control" type="text" id="usulan_dana" name="usulan_dana" value="{{ old('usulan_dana') }}" placeholder="Dana yang ingin diajukan (cth: 12345678 atau 123456.78)" required onkeypress="return isNumberKey(event)" onkeyup="formatRupiah(this)">
</div>
<small id="invalidInput" class="text-danger" style="display: none;">Harap masukkan angka atau desimal (contoh: 12345678 atau 123456.78)</small>
<small id="dotWarning" style="display: none; color: red;">Simbol titik (.) tidak boleh diinputkan lebih dari 1</small>
</div>
</div>
</div>
<div class="mb-0 d-flex justify-content-end">
<div>
<button type="submit" class="btn btn-primary waves-effect waves-light me-1"> Submit </button>
<button type="reset" class="btn btn-secondary waves-effect"> Cancel </button>
<button type="reset" class="btn btn-secondary waves-effect me-1"> Reset </button>
<a href="{{ URL::previous() }}" class="btn btn-danger waves-effect"> Cancel </a>
</div>
</div>
{{ Form::close() }}
......@@ -212,7 +225,61 @@
});
});
</script>
<script>
var rpAdded = false; // Flag untuk menandai apakah 'Rp' sudah ditambahkan
var dotCount = 0; // Menghitung jumlah titik (.) yang sudah dimasukkan
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : event.keyCode;
// Cek apakah karakter yang dimasukkan adalah angka atau titik (.) dan batasi jumlah titik menjadi 1
if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
document.getElementById('invalidInput').style.display = 'block';
document.getElementById('dotWarning').style.display = 'none'; // Sembunyikan peringatan titik (.) berlebihan
return false;
}
document.getElementById('invalidInput').style.display = 'none';
return true;
}
function formatRupiah(el) {
var val = el.value.trim();
// Jika input kosong, reset flag 'rpAdded' dan hitungan titik
if (val === '') {
rpAdded = false;
dotCount = 0;
return;
}
// Tambahkan 'Rp0.' jika input diawali dengan titik (.) dan 'Rp' belum ditambahkan sebelumnya
if (val.startsWith('.') && !rpAdded) {
val = '0.';
rpAdded = true; // Set flag 'rpAdded' menjadi true
dotCount = 1; // Tambahkan satu titik
} else if (!rpAdded) {
// Tambahkan 'Rp' jika 'Rp' belum ditambahkan sebelumnya
val;
rpAdded = true; // Set flag 'rpAdded' menjadi true
}
// Hitung jumlah titik (.) dalam input
dotCount = (val.match(/\./g) || []).length;
// Tampilkan peringatan jika terdapat lebih dari satu titik (.) dan sembunyikan peringatan input tidak valid
if (dotCount > 1) {
document.getElementById('dotWarning').style.display = 'block';
document.getElementById('invalidInput').style.display = 'none'; // Sembunyikan peringatan input tidak valid
var secondDotIndex = val.indexOf('.', val.indexOf('.') + 1);
val = val.slice(0, secondDotIndex) + val.slice(secondDotIndex + 1); // Hapus titik (.) yang berlebihan dari input
dotCount = 1; // Set jumlah titik kembali menjadi 1
} else {
document.getElementById('dotWarning').style.display = 'none'; // Sembunyikan peringatan titik (.) berlebihan
}
el.value = val;
}
</script>
@endsection
resources/views/backend/mahasiswa/proposal/index.blade.php
......@@ -58,14 +58,21 @@
<br>
<div class="table-responsive">
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead>
<thead style="text-align: center; vertical-align: middle;">
{{-- <style>
th {
text-align: center;
vertical-align: middle;
}
</style> --}}
<tr>
<th>No</th>
<th width="5%">Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Usulan Dana</th>
<th>Status</th>
<th>Aksi</th>
</tr>
......@@ -74,40 +81,47 @@
@foreach ($proposal as $item)
@php $token = Str::random(30); @endphp
<tr id="row-{{ $token }}">
<td>{{ $loop->iteration }}</td>
<td>{{ $item->rKelompok->kode }}</td>
<td style="text-align: center;">{{ $loop->iteration }}.</td>
<td style="text-align: center;">{{ $item->rKelompok->kode }}</td>
<td>{{ $item->rKelompok->rBiodata->name }} <br> {{ $item->rKelompok->rBiodata->noidentitas }} <br> {{ $item->rKelompok->rBiodata->fakultas }} <br> {{ $item->rKelompok->rBiodata->prodi }}</td>
<td>{{ $item->rKelompok->nama_dosen }} <br> {{ $item->rKelompok->nidn_dosen }}</td>
<td>{{ $item->rJenis->nama }}</td>
<td>{{ $item->judul }}</td>
<td style="text-align: center;">{{ $item->rKelompok->nama_dosen }} <br> {{ $item->rKelompok->nidn_dosen }}</td>
<td style="text-align: center;">{{ $item->rJenis->nama }}</td>
<td style="text-align: center;">{{ $item->judul }}</td>
<td style="text-align: center;">
@if(substr(number_format($item->usulan_dana, 2, ',', '.'), -3) === ',00')
Rp{{ substr(number_format($item->usulan_dana, 2, ',', '.'), 0, -3) }},-
@else
Rp{{ number_format($item->usulan_dana, 2, ',', '.') }}
@endif
</td>
<td>
@if(is_null($item->upload_dokumen))
<span class="badge bg-danger">Belum Upload Proposal</span><br>
<strong> Keterangan : </strong> <br>
<strong> Keterangan : </strong><br>
Upload proposal pada : -<br>
Disetujui proposal pada : -<br>
@else
@if($item->status == '0')
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span><br>
<strong> Keterangan : </strong> <br>
<strong> Keterangan : </strong><br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@elseif($item->status == '2')
<span class="badge bg-danger">Ditolak Dosen</span><br>
<strong> Keterangan : </strong> <br>
<strong> Keterangan : </strong><br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Komentar : <h6 class="text-primary"> {{ $item->alasan_revisi }} </h6>
@else
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
<span class="badge bg-success">Sudah Disetujui Dosen</span><br>
{{-- <span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br> --}}
<strong> Keterangan : </strong> <br>
<strong> Keterangan : </strong><br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@endif
@endif
</td>
<td>
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm">Lihat</button>
<td style="text-align: center;">
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm"><i class="far fa-eye"></i> Lihat</button>
@if(is_null($item->status) || $item->status == '2')
<a href="{{ URL::to('mahasiswa/proposal/'.encrypt($item->proposal_id).'/edit') }}" class="btn btn-warning btn-sm">Revisi</a>
......@@ -131,7 +145,7 @@
<td>{{ $item->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td>{{ $item->rJenis->nama }}</td>
</tr>
<tr>
......@@ -235,8 +249,6 @@
})
}
</script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
<!-- Kode JavaScript untuk Magnific Popup -->
@if (count($proposal) > 0)
......
resources/views/backend/mahasiswa/seleksi/index_belmawa.blade.php
......@@ -61,7 +61,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......@@ -113,7 +113,7 @@
<td>{{ $item->judul }}</td>
</tr>
<tr>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<td>{{ $item->rJenis->nama }}</td>
</tr>
<tr>
......
resources/views/backend/mahasiswa/seleksi/index_internal.blade.php
......@@ -61,7 +61,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......
resources/views/backend/mahasiswa/seleksi/internal_revisi.blade.php
......@@ -41,7 +41,7 @@
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
<select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option>
......
resources/views/backend/mahasiswa/seleksi/revisi_belmawa.blade.php
......@@ -39,7 +39,7 @@
<label class="col-sm-10 col-form-label">{{ $proposal->judul }}</label>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<label class="col-sm-10 col-form-label">{{ $proposal->rJenis->nama }}</label>
</div>
<div class=" row mb-3">
......
resources/views/backend/operator/daftar_proposal/belmawa.blade.php
......@@ -40,7 +40,7 @@
<div class="row">
<div class="col-md-4">
<div class="row">
<label class="col-sm-3 col-form-label">Jenis PMW : </label>
<label class="col-sm-3 col-form-label">Kategori PMW : </label>
<div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option>
......@@ -84,7 +84,7 @@
<tr>
<th>id</th>
<th>Kode Kelompok</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Dosen Pembimbing</th>
<th>Proposal</th>
......
resources/views/backend/operator/daftar_proposal/excel.blade.php
......@@ -3,7 +3,7 @@
<tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td>
<td style="border: 1px solid #000000;"><strong>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Kategori PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</strong></td>
<td style="border: 1px solid #000000;"><strong>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
resources/views/backend/operator/daftar_proposal/excel_new.blade.php
......@@ -10,7 +10,7 @@
<tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td>
<td style="border: 1px solid #000000;"><strong>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Kategori PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</strong></td>
<td style="border: 1px solid #000000;"><strong>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
resources/views/backend/operator/daftar_proposal/index.blade.php
......@@ -40,7 +40,7 @@
<div class="row">
<div class="col-md-4">
<div class="row">
<label class="col-sm-3 col-form-label">Jenis PMW : </label>
<label class="col-sm-3 col-form-label">Kategori PMW : </label>
<div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option>
......@@ -230,10 +230,10 @@
var isi = this.value;
Swal.fire({
title: "Apakah Anda Yakin?",
text: "Anda akan meruhan jenis PMW ini?!",
text: "Anda akan mengubah Kategori PMW ini?!",
icon: "warning",
showCancelButton: !0,
confirmButtonText: "Ya, Ubah Jenis",
confirmButtonText: "Ya, Ubah Kategori",
cancelButtonText: "Tidak, Kembali!",
confirmButtonClass: "btn btn-success mt-2",
cancelButtonClass: "btn btn-danger ms-2 mt-2",
......
resources/views/backend/operator/daftar_proposal/monev.blade.php
......@@ -44,7 +44,7 @@
<div class="row">
<div class="col-md-4">
<div class="row">
<label class="col-sm-3 col-form-label">Jenis PMW : </label>
<label class="col-sm-3 col-form-label">Kategori PMW : </label>
<div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option>
......@@ -87,7 +87,7 @@
<tr>
<th rowspan="2">id</th>
<th rowspan="2">Kode Kelompok</th>
<th rowspan="2">Jenis PMW</th>
<th rowspan="2">Kategori PMW</th>
<th rowspan="2">Judul Proposal</th>
<th rowspan="2">Dosen Pembimbing</th>
<th rowspan="2">Reviewer 1</th>
......
resources/views/backend/operator/jenis/create.blade.php
......@@ -18,7 +18,7 @@
<h6 class="page-title">{!! $title !!}</h6>
<ol class="breadcrumb m-0">
<li class="breadcrumb-item">Setting</li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PMW</a></li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Kategori PMW</a></li>
<li class="breadcrumb-item">{!! $title !!}</li>
</ol>
</div>
......@@ -33,9 +33,9 @@
{!! Form::open(array('url' => route('operator.jenis.store'), 'method' => 'POST', 'id' => 'ff', 'class' => 'form-horizontal')) !!}
{!! csrf_field() !!}
<div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW</label>
<label for="example-text-input" class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
{{ Form::text('nama', old('nama'), array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PMW')) }}
{{ Form::text('nama', old('nama'), array('class' => 'form-control', 'placeholder' => 'Masukkan Kategori PMW')) }}
@if ($errors->has('nama'))
<span class="help-block">{{$errors->first('nama')}}</span>
@endif
......
resources/views/backend/operator/jenis/edit.blade.php
......@@ -22,7 +22,7 @@
<h6 class="page-title">{!! $title !!}</h6>
<ol class="breadcrumb m-0">
<li class="breadcrumb-item">Setting</li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PMW</a></li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Kategori PMW</a></li>
<li class="breadcrumb-item">{!! $title !!}</li>
</ol>
</div>
......@@ -37,9 +37,9 @@
{!! Form::model($jenis, ['route' => ['operator.jenis.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!}
<div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW</label>
<label for="example-text-input" class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
{{ Form::text('nama', null, array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PMW')) }}
{{ Form::text('nama', null, array('class' => 'form-control', 'placeholder' => 'Masukkan Kategori PMW')) }}
@if ($errors->has('nama'))
<span class="help-block">{{$errors->first('nama')}}</span>
@endif
......
resources/views/backend/operator/jenis/index.blade.php
......@@ -41,7 +41,7 @@
<thead>
<tr>
<th>id</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Deskripsi</th>
<th>Aksi</th>
</tr>
......
resources/views/backend/operator/jenis_penilaian_monev/edit.blade.php
......@@ -38,7 +38,7 @@
{!! Form::model($jenis, ['route' => ['operator.jenis-penilaian-monev.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!}
<div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW </label>
<label for="example-text-input" class="col-sm-2 col-form-label">Kategori PMW </label>
<div class="col-sm-10">
<label for="example-text-input" class="col-sm-2 col-form-label">: {{ $jenis->nama }}</label>
</div>
......
resources/views/backend/operator/jenis_penilaian_monev/index.blade.php
......@@ -36,7 +36,7 @@
<thead>
<tr>
<th>id</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Deskripsi</th>
<th>Jumlah Komponen</th>
<th>Aksi</th>
......
resources/views/backend/operator/proposal/excel.blade.php
......@@ -3,7 +3,7 @@
<tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td>
<td style="border: 1px solid #000000;"><strong>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Kategori PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</strong></td>
<td style="border: 1px solid #000000;"><strong>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
resources/views/backend/operator/proposal/index.blade.php
......@@ -39,7 +39,7 @@
<div class="row">
<div class="col-md-4">
<div class="row">
<label class="col-sm-3 col-form-label">Jenis PMW : </label>
<label class="col-sm-3 col-form-label">Kategori PMW : </label>
<div class="col-sm-6">
<select class="form-select" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option>
......@@ -86,7 +86,7 @@
<th>Kode Kelompok</th>
<th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Aksi</th>
......
resources/views/backend/reviewer/monev/nilai.blade.php
......@@ -40,7 +40,7 @@
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
<span>{{ $monev ? $monev->jenis_pkm : '' }}</span>
</div>
......
resources/views/backend/reviewer/seleksi/index.blade.php
......@@ -78,7 +78,7 @@
<tr>
<th>id</th>
<th>Kode Kelompok</th>
<th>Jenis PMW</th>
<th>Kategori PMW</th>
<th>Judul Proposal</th>
<th>Status</th>
<th>Proposal</th>
......
resources/views/backend/reviewer/seleksi/nilai.blade.php
......@@ -40,7 +40,7 @@
</div>
</div>
<div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-2 col-form-label">Kategori PMW</label>
<div class="col-sm-10">
<span>{{ $proposal ? $proposal->jenis_pkm : '' }}</span>
</div>
......
resources/views/layouts/headpg.blade.php
......@@ -28,6 +28,9 @@
<link href="{{ asset('theme/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css') }}" rel="stylesheet"
type="text/css">
<!-- Magnific Popup -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css">
<!-- Responsive datatable examples -->
<link href="{{ asset('theme/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css') }}"
rel="stylesheet" type="text/css">
......
resources/views/layouts/inijs.blade.php
......@@ -49,6 +49,9 @@
<script src="{{ asset('theme/libs/select2/js/select2.min.js') }}"></script>
{{-- <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> --}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
{{-- <script type="text/javascript" src="{{ asset('theme/js/eModal.js') }}"></script> --}}
{{-- <script>
function openPopup(linkUrl) {
......
resources/views/layouts/menu.blade.php
......@@ -28,7 +28,7 @@
<li class="{{ (request()->is('operator/jenis/*')) ? 'mm-active' : '' }}">
<a href="{{ URL::to('operator/jenis') }}" class="waves-effect">
<i class="ti-home"></i>
<span>Jenis PMW</span>
<span>Kategori PMW</span>
</a>
</li>
<li class="{{ (request()->is('operator/jenis-penilaian-monev/*')) ? 'mm-active' : '' }}">
......
routes/web.php
......@@ -128,7 +128,7 @@ Route::group(['middleware' => ['auth:sanctum', 'verified']], function () {
//proposal
Route::resource('proposal', DosenProposal::class);
Route::post('/proposal-setuju', [DosenProposal::class, 'setuju'])->name('proposal.setuju');
Route::get('/proposal-lihat', [DosenProposal::class, 'lihat'])->name('proposal.lihat');
Route::get('/proposal-lihat', [DosenProposal::class, 'lihat'])->name('proposal-lihat');
Route::get('/proposal-approv/{id}', [DosenProposal::class, 'approve'])->name('proposal.approv');
Route::post('/proposal-tolak', [DosenProposal::class, 'tolak'])->name('proposal.tolak');
......
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