Commit e9f11753 by Alfiro Pratama

me

parents d9ce9ae5 f5057285
...@@ -49,7 +49,7 @@ class DaftarProposalBelmawaExport implements FromView,ShouldAutoSize ...@@ -49,7 +49,7 @@ class DaftarProposalBelmawaExport implements FromView,ShouldAutoSize
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$dospem = "(".str_replace("###",") ",$value->identitas_dospem); $dospem = "(".str_replace("###",") ",$value->identitas_dospem);
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$value->periode."/".$value->upload_dokumen;
$urut = 1; $urut = 1;
foreach ($value->rKelompokDetil as $keys => $detil) { foreach ($value->rKelompokDetil as $keys => $detil) {
......
...@@ -55,7 +55,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -55,7 +55,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
$data_dospem = explode('###', $value->identitas_dospem); $data_dospem = explode('###', $value->identitas_dospem);
$data_ketua = explode('###', $value->identitas_ketua); $data_ketua = explode('###', $value->identitas_ketua);
$dospem = "(".$data_dospem[0].") ".$data_dospem[1]; $dospem = "(".$data_dospem[0].") ".$data_dospem[1];
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$value->periode."/".$value->upload_dokumen;
if($value->status_final == '1') if($value->status_final == '1')
$status_final = "Lolos"; $status_final = "Lolos";
......
...@@ -49,7 +49,7 @@ class DaftarProposalMonevExport implements FromView,ShouldAutoSize ...@@ -49,7 +49,7 @@ class DaftarProposalMonevExport implements FromView,ShouldAutoSize
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$dospem = "(".str_replace("###",") ",$value->identitas_dospem); $dospem = "(".str_replace("###",") ",$value->identitas_dospem);
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$value->periode."/".$value->upload_dokumen;
$urut = 1; $urut = 1;
foreach ($value->rKelompokDetil as $keys => $detil) { foreach ($value->rKelompokDetil as $keys => $detil) {
......
...@@ -49,7 +49,7 @@ class ProposalExport implements FromView,ShouldAutoSize ...@@ -49,7 +49,7 @@ class ProposalExport implements FromView,ShouldAutoSize
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$dospem = "(".str_replace("###",") ",$value->identitas_dospem); $dospem = "(".str_replace("###",") ",$value->identitas_dospem);
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$value->periode."/".$value->upload_dokumen;
$urut = 1; $urut = 1;
foreach ($value->rKelompokDetil as $keys => $detil) { foreach ($value->rKelompokDetil as $keys => $detil) {
......
...@@ -15,7 +15,7 @@ class DashboardController extends Controller ...@@ -15,7 +15,7 @@ class DashboardController extends Controller
public function index() public function index()
{ {
// //
$title = 'Dashboard PKM'; $title = 'Dashboard PMW';
// $pengumuman = $pengumuman = Pengumuman::query()->first(); // $pengumuman = $pengumuman = Pengumuman::query()->first();
$data = [ $data = [
......
...@@ -76,8 +76,8 @@ class ProposalController extends Controller ...@@ -76,8 +76,8 @@ class ProposalController extends Controller
$no = 1; $no = 1;
if($item->upload_dokumen){ if($item->upload_dokumen){
$dokumen = ' <a href="https://statik.unesa.ac.id/simpkm/proposal/'. $item->rPeriode->nama .'/'. $item->upload_dokumen.'" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> $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/simpkm/proposal/'. $item->rPeriode->nama .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>'; <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{ }else{
$dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> $dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan. <strong>Informasi!</strong><br/> File tidak ditemukan.
...@@ -96,7 +96,7 @@ class ProposalController extends Controller ...@@ -96,7 +96,7 @@ class ProposalController extends Controller
<td>".$item->judul."</td> <td>".$item->judul."</td>
</tr> </tr>
<tr> <tr>
<td>Jenis PKM</td> <td>Jenis PMW</td>
<td>".$item->rJenis->nama."</td> <td>".$item->rJenis->nama."</td>
</tr> </tr>
<tr> <tr>
...@@ -109,7 +109,7 @@ class ProposalController extends Controller ...@@ -109,7 +109,7 @@ class ProposalController extends Controller
</tr> </tr>
<tr> <tr>
<td>Video Produk</td> <td>Video Produk</td>
<td>".$item['url']->url."</td> <td>".$item['url']->url`."</td>
</tr> </tr>
"; ";
......
...@@ -88,8 +88,8 @@ class SeleksiController extends Controller ...@@ -88,8 +88,8 @@ class SeleksiController extends Controller
$data = '';; $data = '';;
if($item->upload_dokumen){ if($item->upload_dokumen){
$dokumen = ' <a href="https://statik.unesa.ac.id/simpkm/proposal/'. $item->periode .'/'. $item->upload_dokumen.'" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> $dokumen = ' <a href="https://statik.unesa.ac.id/simpmw/proposal/'. $item->periode .'/'. $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/simpkm/proposal/'. $item->periode .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>'; <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpmw/proposal/'. $item->periode .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>';
}else{ }else{
$dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> $dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan. <strong>Informasi!</strong><br/> File tidak ditemukan.
...@@ -108,7 +108,7 @@ class SeleksiController extends Controller ...@@ -108,7 +108,7 @@ class SeleksiController extends Controller
<td>".$item->judul."</td> <td>".$item->judul."</td>
</tr> </tr>
<tr> <tr>
<td>Jenis PKM</td> <td>Jenis PMW</td>
<td>".$item->jenis_pkm."</td> <td>".$item->jenis_pkm."</td>
</tr> </tr>
<tr> <tr>
......
...@@ -62,7 +62,7 @@ class LuaranController extends Controller ...@@ -62,7 +62,7 @@ class LuaranController extends Controller
$file_nama = $proposal->rPeriode->nama.'_'.$proposal->proposal_id.'_'.$luaran['jenis_luaran'].'.'.$luaran['file']->getClientOriginalExtension(); $file_nama = $proposal->rPeriode->nama.'_'.$proposal->proposal_id.'_'.$luaran['jenis_luaran'].'.'.$luaran['file']->getClientOriginalExtension();
Storage::disk('static')->put('simpkm/luaran/'.$luaran['jenis_luaran'].'/'.$file_nama, file_get_contents($luaran['file']->getRealPath())); Storage::disk('static')->put('simpmw/luaran/'.$luaran['jenis_luaran'].'/'.$file_nama, file_get_contents($luaran['file']->getRealPath()));
ProposalLuaran::create([ ProposalLuaran::create([
'proposal_id' => $luaran['proposal_id'], 'proposal_id' => $luaran['proposal_id'],
...@@ -102,7 +102,7 @@ class LuaranController extends Controller ...@@ -102,7 +102,7 @@ class LuaranController extends Controller
$proposal = Proposal::query()->find(decrypt($pro['id'])); $proposal = Proposal::query()->find(decrypt($pro['id']));
Storage::disk('static')->delete('simpkm/luaran/'.$proposal->jenis_luaran.'/'.$proposal->file_luaran); Storage::disk('static')->delete('simpmw/luaran/'.$proposal->jenis_luaran.'/'.$proposal->file_luaran);
$proposal->delete(); $proposal->delete();
......
...@@ -120,7 +120,7 @@ class MonevController extends Controller ...@@ -120,7 +120,7 @@ class MonevController extends Controller
$file_nama = $proposal->rProposal->rPeriode->nama.'_'.$proposal->rProposal->proposal_id.'.'.$pro['file']->getClientOriginalExtension(); $file_nama = $proposal->rProposal->rPeriode->nama.'_'.$proposal->rProposal->proposal_id.'.'.$pro['file']->getClientOriginalExtension();
Storage::disk('static')->put('simpkm/monev/'.$pro['monev'].'/'.$pro['type'].'/'.$file_nama, file_get_contents($pro['file']->getRealPath())); Storage::disk('static')->put('simpmw/monev/'.$pro['monev'].'/'.$pro['type'].'/'.$file_nama, file_get_contents($pro['file']->getRealPath()));
if($pro['type'] == 'logbook'){ if($pro['type'] == 'logbook'){
$proposal->logbook_file = $file_nama; $proposal->logbook_file = $file_nama;
......
...@@ -134,7 +134,11 @@ class ProposalController extends Controller ...@@ -134,7 +134,11 @@ class ProposalController extends Controller
$file_nama = $periode->nama.'_'.$uuid.'.'.$proposal['file']->getClientOriginalExtension(); $file_nama = $periode->nama.'_'.$uuid.'.'.$proposal['file']->getClientOriginalExtension();
<<<<<<< HEAD
Storage::disk('local')->put('simpkm/proposal/'.$periode->nama.'/'.$file_nama, file_get_contents($proposal['file']->getRealPath())); Storage::disk('local')->put('simpkm/proposal/'.$periode->nama.'/'.$file_nama, file_get_contents($proposal['file']->getRealPath()));
=======
Storage::disk('static')->put('simpmw/proposal/'.$periode->nama.'/'.$file_nama, file_get_contents($proposal['file']->getRealPath()));
>>>>>>> f50572854f87f0e3e0e9be1c6be0a2fb241bd85c
$kel = Proposal::create([ $kel = Proposal::create([
'proposal_id' => $uuid, 'proposal_id' => $uuid,
...@@ -225,10 +229,10 @@ class ProposalController extends Controller ...@@ -225,10 +229,10 @@ class ProposalController extends Controller
if(!isset($proposal['file'])){ if(!isset($proposal['file'])){
$file_nama = $pro->upload_dokumen; $file_nama = $pro->upload_dokumen;
} else { } else {
// Storage::disk('static')->delete('simpkm/proposal/'.$pro->rPeriode->nama.'/'.$pro->upload_dokumen); // Storage::disk('static')->delete('simpmw/proposal/'.$pro->rPeriode->nama.'/'.$pro->upload_dokumen);
$file_nama = $pro->rPeriode->nama.'_'.$pro->proposal_id.'.'.$proposal['file']->getClientOriginalExtension(); $file_nama = $pro->rPeriode->nama.'_'.$pro->proposal_id.'.'.$proposal['file']->getClientOriginalExtension();
Storage::disk('static')->put('simpkm/proposal/'.$pro->rPeriode->nama.'/'.$file_nama, file_get_contents($proposal['file']->getRealPath())); Storage::disk('static')->put('simpmw/proposal/'.$pro->rPeriode->nama.'/'.$file_nama, file_get_contents($proposal['file']->getRealPath()));
} }
$pro->jenis_id = $proposal['jenis']; $pro->jenis_id = $proposal['jenis'];
...@@ -249,7 +253,7 @@ class ProposalController extends Controller ...@@ -249,7 +253,7 @@ class ProposalController extends Controller
$proposal = Proposal::query()->find(decrypt($pro['id'])); $proposal = Proposal::query()->find(decrypt($pro['id']));
Storage::disk('static')->delete('simpkm/proposal/'.$proposal->rPeriode->nama.'/'.$proposal->upload_dokumen); Storage::disk('static')->delete('simpmw/proposal/'.$proposal->rPeriode->nama.'/'.$proposal->upload_dokumen);
$proposal->delete(); $proposal->delete();
......
...@@ -148,7 +148,7 @@ class SeleksiController extends Controller ...@@ -148,7 +148,7 @@ class SeleksiController extends Controller
$file_nama = $proposal->rPeriode->nama.'_'.$proposal->proposal_id.'.'.$pro['file']->getClientOriginalExtension(); $file_nama = $proposal->rPeriode->nama.'_'.$proposal->proposal_id.'.'.$pro['file']->getClientOriginalExtension();
Storage::disk('static')->put('simpkm/proposal/revisi/'.$proposal->rPeriode->nama.'/'.$file_nama, file_get_contents($pro['file']->getRealPath())); Storage::disk('static')->put('simpmw/proposal/revisi/'.$proposal->rPeriode->nama.'/'.$file_nama, file_get_contents($pro['file']->getRealPath()));
$belmawa->upload_dokumen = $file_nama ; $belmawa->upload_dokumen = $file_nama ;
$belmawa->date_upload = now(); $belmawa->date_upload = now();
...@@ -171,8 +171,8 @@ class SeleksiController extends Controller ...@@ -171,8 +171,8 @@ class SeleksiController extends Controller
$no = 1; $no = 1;
if($item->upload_dokumen){ if($item->upload_dokumen){
$dokumen = ' <a href="https://statik.unesa.ac.id/simpkm/proposal/'. $item->periode .'/'. $item->upload_dokumen.'" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> $dokumen = ' <a href="https://statik.unesa.ac.id/simpmw/proposal/'. $item->periode .'/'. $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/simpkm/proposal/'. $item->periode .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>'; <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpmw/proposal/'. $item->periode .'/'.$item->upload_dokumen .'" frameborder="0"></iframe>';
}else{ }else{
$dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> $dokumen = '<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong><br/> File tidak ditemukan. <strong>Informasi!</strong><br/> File tidak ditemukan.
...@@ -191,7 +191,7 @@ class SeleksiController extends Controller ...@@ -191,7 +191,7 @@ class SeleksiController extends Controller
<td>".$item->judul."</td> <td>".$item->judul."</td>
</tr> </tr>
<tr> <tr>
<td>Jenis PKM</td> <td>Jenis PMW</td>
<td>".$item->jenis_pkm."</td> <td>".$item->jenis_pkm."</td>
</tr> </tr>
<tr> <tr>
......
...@@ -336,7 +336,7 @@ class DaftarProposalController extends Controller ...@@ -336,7 +336,7 @@ class DaftarProposalController extends Controller
$proposal = '<span class="badge bg-warning">Dokumen belum diunggah.</span>'; $proposal = '<span class="badge bg-warning">Dokumen belum diunggah.</span>';
else else
{ {
$url = "https://statik.unesa.ac.id/simpkm/proposal/revisi/".$record->periode."/".$record->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/revisi/".$record->periode."/".$record->upload_dokumen;
$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>'; $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>';
} }
...@@ -595,7 +595,7 @@ class DaftarProposalController extends Controller ...@@ -595,7 +595,7 @@ class DaftarProposalController extends Controller
if ($delete) { if ($delete) {
$status = 'success'; $status = 'success';
$message = "Berhasil ubah Jenis PKM."; $message = "Berhasil ubah Jenis PMW.";
} }
else{ else{
$status = 'error'; $status = 'error';
...@@ -673,7 +673,7 @@ class DaftarProposalController extends Controller ...@@ -673,7 +673,7 @@ class DaftarProposalController extends Controller
$data_dospem = explode('###', $value->identitas_dospem); $data_dospem = explode('###', $value->identitas_dospem);
$data_ketua = explode('###', $value->identitas_ketua); $data_ketua = explode('###', $value->identitas_ketua);
$dospem = "(".$data_dospem[0].") ".$data_dospem[1]; $dospem = "(".$data_dospem[0].") ".$data_dospem[1];
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$value->periode."/".$value->upload_dokumen;
if($value->status_final == '1') if($value->status_final == '1')
$status_final = "Lolos"; $status_final = "Lolos";
......
...@@ -18,7 +18,7 @@ class JenisController extends Controller ...@@ -18,7 +18,7 @@ class JenisController extends Controller
{ {
public function index() public function index()
{ {
return view('backend.operator.jenis.index')->withTitle('Jenis PKM'); return view('backend.operator.jenis.index')->withTitle('Jenis PMW');
} }
/* AJAX request */ /* AJAX request */
...@@ -89,7 +89,7 @@ class JenisController extends Controller ...@@ -89,7 +89,7 @@ class JenisController extends Controller
public function create() public function create()
{ {
return view('backend.operator.jenis.create')->withTitle('Tambah Jenis PKM'); return view('backend.operator.jenis.create')->withTitle('Tambah Jenis PMW');
} }
public function store(Request $request) public function store(Request $request)
...@@ -123,7 +123,7 @@ class JenisController extends Controller ...@@ -123,7 +123,7 @@ class JenisController extends Controller
'jenis' => $jenis 'jenis' => $jenis
]; ];
return view('backend.operator.jenis.edit', compact('data'))->withTitle('Ubah Jenis PKM'); return view('backend.operator.jenis.edit', compact('data'))->withTitle('Ubah Jenis PMW');
} }
public function update(Request $request, $id) public function update(Request $request, $id)
...@@ -147,11 +147,11 @@ class JenisController extends Controller ...@@ -147,11 +147,11 @@ class JenisController extends Controller
if ($delete == 1) { if ($delete == 1) {
$status = 'success'; $status = 'success';
$message = "Jenis PKM berhasil dihapus."; $message = "Jenis PMW berhasil dihapus.";
} }
else{ else{
$status = 'error'; $status = 'error';
$message = "Jenis PKM tidak ada."; $message = "Jenis PMW tidak ada.";
} }
return response()->json([ return response()->json([
......
...@@ -19,7 +19,7 @@ class JenisPenilaianMonevController extends Controller ...@@ -19,7 +19,7 @@ class JenisPenilaianMonevController extends Controller
{ {
public function index() public function index()
{ {
return view('backend.operator.jenis_penilaian_monev.index')->withTitle('Jenis PKM'); return view('backend.operator.jenis_penilaian_monev.index')->withTitle('Jenis PMW');
} }
/* AJAX request */ /* AJAX request */
...@@ -108,7 +108,7 @@ class JenisPenilaianMonevController extends Controller ...@@ -108,7 +108,7 @@ class JenisPenilaianMonevController extends Controller
'jenis_penilaian_monev' => $jenis_penilaian_monev 'jenis_penilaian_monev' => $jenis_penilaian_monev
]; ];
return view('backend.operator.jenis_penilaian_monev.edit', compact('data'))->withTitle('Ubah Jenis PKM'); return view('backend.operator.jenis_penilaian_monev.edit', compact('data'))->withTitle('Ubah Jenis PMW');
} }
public function update(Request $request, $id) public function update(Request $request, $id)
...@@ -117,13 +117,16 @@ class JenisPenilaianMonevController extends Controller ...@@ -117,13 +117,16 @@ class JenisPenilaianMonevController extends Controller
for($i=0; $i<count($request->nama); $i++) for($i=0; $i<count($request->nama); $i++)
{ {
$uuid = Uuid::generate(); $uuid = decrypt($request->jenis_penilaian_monev_id[$i]);
$data['jenis_penilaian_monev_id'] = $uuid; $data['jenis_penilaian_monev_id'] = $uuid;
$data['jenis_id'] = $id; $data['jenis_id'] = $id;
$data['nama'] = $request->nama[$i]; $data['nama'] = $request->nama[$i];
$data['bobot'] = $request->bobot[$i]; $data['bobot'] = 1;
JenisPenilaianMonev::create($data); JenisPenilaianMonev::updateOrCreate([
'jenis_penilaian_monev_id' => $uuid
],
$data);
} }
Alert::success('Data berhasil disimpan.')->persistent('Ok'); Alert::success('Data berhasil disimpan.')->persistent('Ok');
......
...@@ -25,6 +25,7 @@ use App\Http\Controllers\Controller; ...@@ -25,6 +25,7 @@ use App\Http\Controllers\Controller;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use App\Models\DaftarProposalBelmawa; use App\Models\DaftarProposalBelmawa;
use App\Exports\DaftarProposalMonevExport; use App\Exports\DaftarProposalMonevExport;
use Illuminate\Support\Facades\Log;
class MonevProposalController extends Controller class MonevProposalController extends Controller
{ {
...@@ -106,6 +107,7 @@ class MonevProposalController extends Controller ...@@ -106,6 +107,7 @@ class MonevProposalController extends Controller
->get(); ->get();
$data_arr = array(); $data_arr = array();
foreach($records as $record){ foreach($records as $record){
$proposal_id = $record->proposal_id; $proposal_id = $record->proposal_id;
$monev_internal_id = $record->monev_internal_id; $monev_internal_id = $record->monev_internal_id;
...@@ -120,7 +122,7 @@ class MonevProposalController extends Controller ...@@ -120,7 +122,7 @@ class MonevProposalController extends Controller
$nilai_2 = $record->nilai_2; $nilai_2 = $record->nilai_2;
$reviewer_id_1 = $record->reviewer_id_1; $reviewer_id_1 = $record->reviewer_id_1;
$reviewer_id_2 = $record->reviewer_id_2; $reviewer_id_2 = $record->reviewer_id_2;
$status_final = $record->status_final; $status_final = $record->status;
$rata = $record->rata; $rata = $record->rata;
// $rata = ($nilai_1 + $nilai_2) / 2; // $rata = ($nilai_1 + $nilai_2) / 2;
...@@ -345,7 +347,8 @@ class MonevProposalController extends Controller ...@@ -345,7 +347,8 @@ class MonevProposalController extends Controller
public function approval($id, $status) public function approval($id, $status)
{ {
try { try {
$delete = ReviewerMonev::where('proposal_id', Crypt::decrypt($id))->update(['status_final'=>$status]); Log::debug(Crypt::decrypt($id));
$delete = ReviewerMonev::where('monev_internal_id', Crypt::decrypt($id))->update(['status_final'=>$status]);
if ($delete) { if ($delete) {
if($status == '1') if($status == '1')
...@@ -370,6 +373,8 @@ class MonevProposalController extends Controller ...@@ -370,6 +373,8 @@ class MonevProposalController extends Controller
]); ]);
} catch (\Exception $id) { } catch (\Exception $id) {
Log::error($id);
return response()->json([ return response()->json([
'status' => 'error', 'status' => 'error',
'message' => "Data gagal diproses.", 'message' => "Data gagal diproses.",
......
...@@ -110,7 +110,7 @@ class ProposalController extends Controller ...@@ -110,7 +110,7 @@ class ProposalController extends Controller
} }
else else
{ {
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$record->periode."/".$record->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$record->periode."/".$record->upload_dokumen;
if($status == '1') if($status == '1')
{ {
......
...@@ -105,7 +105,7 @@ class DaftarMonevController extends Controller ...@@ -105,7 +105,7 @@ class DaftarMonevController extends Controller
$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_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>'; $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 = "https://statik.unesa.ac.id/simpkm/proposal/".$record->periode."/".$record->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$record->periode."/".$record->upload_dokumen;
$urut = DB::select("select ambil_data_reviewer_monev('".$this->rBiodata->noidentitas."', '".$monev_internal_id."', '1')")[0]->ambil_data_reviewer_monev; $urut = DB::select("select ambil_data_reviewer_monev('".$this->rBiodata->noidentitas."', '".$monev_internal_id."', '1')")[0]->ambil_data_reviewer_monev;
......
...@@ -21,7 +21,10 @@ use Illuminate\Support\Carbon; ...@@ -21,7 +21,10 @@ use Illuminate\Support\Carbon;
use App\Models\ReviewerProposal; use App\Models\ReviewerProposal;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\DaftarProposalBelmawa; use App\Models\DaftarProposalBelmawa;
use App\Models\JenisMonev;
use App\Models\MonevInternal;
use App\Models\ReviewerProposalDetil; use App\Models\ReviewerProposalDetil;
use Illuminate\Support\Facades\Log;
class DaftarSeleksiController extends Controller class DaftarSeleksiController extends Controller
{ {
...@@ -125,7 +128,7 @@ class DaftarSeleksiController extends Controller ...@@ -125,7 +128,7 @@ class DaftarSeleksiController extends Controller
$nilai_2= DB::select("select ambil_jumlah_penilaian_seleksi('".$record->reviewer_proposal_id_2."')")[0]->ambil_jumlah_penilaian_seleksi; $nilai_2= DB::select("select ambil_jumlah_penilaian_seleksi('".$record->reviewer_proposal_id_2."')")[0]->ambil_jumlah_penilaian_seleksi;
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$record->periode."/".$record->upload_dokumen; $url = "https://statik.unesa.ac.id/simpmw/proposal/".$record->periode."/".$record->upload_dokumen;
$urut = DB::select("select ambil_data_reviewer_proposal('".$noidentitas."', '".$proposal_id."', '1')")[0]->ambil_data_reviewer_proposal; $urut = DB::select("select ambil_data_reviewer_proposal('".$noidentitas."', '".$proposal_id."', '1')")[0]->ambil_data_reviewer_proposal;
...@@ -158,7 +161,7 @@ class DaftarSeleksiController extends Controller ...@@ -158,7 +161,7 @@ class DaftarSeleksiController extends Controller
if($status_administrasi != 0) if($status_administrasi != 0)
{ {
if($status_nilai > 0) if($status_nilai == 0)
{ {
if($urut == '1') if($urut == '1')
$aksi = '<h4>'.$nilai_1.'</h4>'; $aksi = '<h4>'.$nilai_1.'</h4>';
...@@ -241,7 +244,7 @@ class DaftarSeleksiController extends Controller ...@@ -241,7 +244,7 @@ class DaftarSeleksiController extends Controller
$urut = DB::select("select ambil_data_reviewer_proposal('".$this->rBiodata->noidentitas."', '".decrypt($id)."', '1')")[0]->ambil_data_reviewer_proposal; $urut = DB::select("select ambil_data_reviewer_proposal('".$this->rBiodata->noidentitas."', '".decrypt($id)."', '1')")[0]->ambil_data_reviewer_proposal;
$title = 'Penilaian Proposal Seleksi Internal'; $title = 'Penilaian Proposal Seleksi Internal';
$proposal = DaftarProposal::where('proposal_id', decrypt($id))->first(); $proposal = DaftarProposal::query()->with('proposalUrl')->where('proposal_id', decrypt($id))->first();
$reviewer_proposal = ReviewerProposal::with('rReviewerProposalDetil')->where('proposal_id', decrypt($id))->where('urut', $urut)->first(); $reviewer_proposal = ReviewerProposal::with('rReviewerProposalDetil')->where('proposal_id', decrypt($id))->where('urut', $urut)->first();
$komponen = JenisPenilaianMonev::where('jenis_id', $proposal->jenis_id)->get(); $komponen = JenisPenilaianMonev::where('jenis_id', $proposal->jenis_id)->get();
...@@ -276,7 +279,6 @@ class DaftarSeleksiController extends Controller ...@@ -276,7 +279,6 @@ class DaftarSeleksiController extends Controller
{ {
try { try {
$urut = DB::select("select ambil_data_reviewer_proposal('".$this->rBiodata->noidentitas."', '".decrypt($id)."', '1')")[0]->ambil_data_reviewer_proposal; $urut = DB::select("select ambil_data_reviewer_proposal('".$this->rBiodata->noidentitas."', '".decrypt($id)."', '1')")[0]->ambil_data_reviewer_proposal;
$delete = ReviewerProposal::where('proposal_id', Crypt::decrypt($id))->where('urut', $urut)->update(['status_administrasi'=>$status]); $delete = ReviewerProposal::where('proposal_id', Crypt::decrypt($id))->where('urut', $urut)->update(['status_administrasi'=>$status]);
if ($delete) { if ($delete) {
...@@ -284,6 +286,8 @@ class DaftarSeleksiController extends Controller ...@@ -284,6 +286,8 @@ class DaftarSeleksiController extends Controller
{ {
$status = 'success'; $status = 'success';
$message = "Proposal Seleksi Internal Lolos Administrasi."; $message = "Proposal Seleksi Internal Lolos Administrasi.";
$this->createMonevInternal(Crypt::decrypt($id));
} }
elseif($status == '2') elseif($status == '2')
{ {
...@@ -308,4 +312,28 @@ class DaftarSeleksiController extends Controller ...@@ -308,4 +312,28 @@ class DaftarSeleksiController extends Controller
]); ]);
} }
} }
private function createMonevInternal($proposalId)
{
$reviewerProposal = ReviewerProposal::where('proposal_id', $proposalId)->whereIn('urut', [1, 2]);
$count = $reviewerProposal->where('status_administrasi', 1)->count();
$monevInternal = MonevInternal::query()->where('proposal_id', $proposalId)->get();
if($count == 2){
for ($i = 3; $i < 5; $i++) {
$jenis = JenisMonev::query()->where('urut', $i)->first();
$monevInternal->where('jenis_monev_id', $jenis->jenis_monev_id);
if($monevInternal->count() == 0){
Log::debug('create monev');
MonevInternal::query()->create([
'proposal_id' => $proposalId,
'jenis_monev_id' => $jenis->jenis_monev_id,
'created_user' => 'SYSTEM',
]);
}
}
}
}
} }
...@@ -9,6 +9,7 @@ class DaftarProposal extends Model ...@@ -9,6 +9,7 @@ class DaftarProposal extends Model
protected $table = 'daftar_proposal'; protected $table = 'daftar_proposal';
protected $primaryKey = 'proposal_id'; protected $primaryKey = 'proposal_id';
public $incrementing = false; public $incrementing = false;
protected $keyType = 'string';
protected $fillable = [ protected $fillable = [
'proposal_id', 'jenis_id', 'kode', 'jenis_pkm', 'judul', 'status', 'status_hapus', 'status_administrasi_1', 'status_administrasi_2', 'reviewer_id_1', 'reviewer_id_2', 'status_final', 'nidn_reviewer_id_1', 'nidn_reviewer_id_2', 'upload_dokumen', 'date_upload', 'date_approval', 'identitas_ketua', 'identitas_dospem', 'periode' 'proposal_id', 'jenis_id', 'kode', 'jenis_pkm', 'judul', 'status', 'status_hapus', 'status_administrasi_1', 'status_administrasi_2', 'reviewer_id_1', 'reviewer_id_2', 'status_final', 'nidn_reviewer_id_1', 'nidn_reviewer_id_2', 'upload_dokumen', 'date_upload', 'date_approval', 'identitas_ketua', 'identitas_dospem', 'periode'
...@@ -18,4 +19,9 @@ class DaftarProposal extends Model ...@@ -18,4 +19,9 @@ class DaftarProposal extends Model
{ {
return $this->hasMany(\App\Models\KelompokDetail::class, 'kelompok_id', 'kelompok_id'); return $this->hasMany(\App\Models\KelompokDetail::class, 'kelompok_id', 'kelompok_id');
} }
public function proposalUrl()
{
return $this->hasMany(ProposalUrl::class, 'proposal_id', 'proposal_id');
}
} }
...@@ -2,9 +2,15 @@ ...@@ -2,9 +2,15 @@
namespace App\Models; namespace App\Models;
<<<<<<< HEAD
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use App\Traits\UuidTrait; use App\Traits\UuidTrait;
=======
use App\Traits\UuidTrait;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
>>>>>>> f50572854f87f0e3e0e9be1c6be0a2fb241bd85c
class ProposalUrl extends Model class ProposalUrl extends Model
{ {
...@@ -14,10 +20,15 @@ class ProposalUrl extends Model ...@@ -14,10 +20,15 @@ class ProposalUrl extends Model
protected $table = 'proposal_url'; protected $table = 'proposal_url';
protected $primaryKey = 'id'; protected $primaryKey = 'id';
public $incrementing = false; public $incrementing = false;
<<<<<<< HEAD
=======
protected $keyType = 'string';
>>>>>>> f50572854f87f0e3e0e9be1c6be0a2fb241bd85c
protected $fillable = [ protected $fillable = [
'id', 'id',
'url', 'url',
<<<<<<< HEAD
'url_name', 'url_name',
'deskripsi', 'deskripsi',
'proposal_id', 'proposal_id',
...@@ -29,4 +40,12 @@ class ProposalUrl extends Model ...@@ -29,4 +40,12 @@ class ProposalUrl extends Model
{ {
return $this->belongsTo(Proposal::class, 'proposal_id', 'id'); return $this->belongsTo(Proposal::class, 'proposal_id', 'id');
} }
=======
'nama',
'deskripsi',
'proposal_id',
'created_at',
'updated_at',
];
>>>>>>> f50572854f87f0e3e0e9be1c6be0a2fb241bd85c
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Login | SIM PKM UNESA</title> <title>Login | SIM PMW UNESA</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="Premium Multipurpose Admin & Dashboard Template" name="description"> <meta content="Premium Multipurpose Admin & Dashboard Template" name="description">
<meta content="Themesbrand" name="author"> <meta content="Themesbrand" name="author">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="bg-primary"> <div class="bg-primary">
<div class="text-primary text-center p-4"> <div class="text-primary text-center p-4">
<h5 class="text-white font-size-20">LOGIN</h5> <h5 class="text-white font-size-20">LOGIN</h5>
<p class="text-white-50">Sistem Informasi PKM.</p> <p class="text-white-50">Sistem Informasi PMW.</p>
<a href="{{ url('/') }}" class="logo logo-admin"> <a href="{{ url('/') }}" class="logo logo-admin">
<img src="{{ asset('theme/images/logo-login.png') }}" height="66" alt="logo"> <img src="{{ asset('theme/images/logo-login.png') }}" height="66" alt="logo">
</a> </a>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
<div class="mt-5 text-center"> <div class="mt-5 text-center">
<p class="mb-0">© <script>document.write(new Date().getFullYear())</script> SIM PKM. Crafted with <i class="mdi mdi-heart text-danger"></i> by PPTI</p> <p class="mb-0">© <script>document.write(new Date().getFullYear())</script> SIM PMW. Crafted with <i class="mdi mdi-heart text-danger"></i> by PPTI</p>
</div> </div>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<td>{{ $loop->iteration }}</td> <td>{{ $loop->iteration }}</td>
<td>{{ $item->jenis_luaran }}</td> <td>{{ $item->jenis_luaran }}</td>
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
<td><a href="https://statik.unesa.ac.id/simpkm/luaran/{{ $item->jenis_luaran }}/{{ $item->file_luaran }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a></td> <td><a href="https://statik.unesa.ac.id/simpmw/luaran/{{ $item->jenis_luaran }}/{{ $item->file_luaran }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a></td>
</tr> </tr>
@endforeach @endforeach
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th> <th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th> <th>Laporan Kemajuan</th>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td> <td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpmw/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<th>No</th> <th>No</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th> <th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th> <th width="10%">Laporan Kemajuan</th>
...@@ -80,14 +80,14 @@ ...@@ -80,14 +80,14 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/I/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/I/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->kemajuan_file)) @if(is_null($item->kemajuan_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/I/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/I/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<th>No</th> <th>No</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th> <th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th> <th width="10%">Laporan Kemajuan</th>
...@@ -80,14 +80,14 @@ ...@@ -80,14 +80,14 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/II/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/II/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->kemajuan_file)) @if(is_null($item->kemajuan_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/II/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/II/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<th>No</th> <th>No</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th> <th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th> <th>Laporan Kemajuan</th>
...@@ -80,21 +80,21 @@ ...@@ -80,21 +80,21 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->kemajuan_file)) @if(is_null($item->kemajuan_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->akhir_file)) @if(is_null($item->akhir_file))
<span class="badge bg-danger">Belum Upload</span> <span class="badge bg-danger">Belum Upload</span>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/akhir/{{ $item->akhir_file }}" target="_blank" title="Laporan Akhir" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/akhir/{{ $item->akhir_file }}" target="_blank" title="Laporan Akhir" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
{{-- <th>Identitas Dosen Pembimbing</th> --}} {{-- <th>Identitas Dosen Pembimbing</th> --}}
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>No</th> <th>No</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> <a href="https://statik.unesa.ac.id/simpmw/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->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="200px" src="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" frameborder="0"></iframe> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpmw/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" frameborder="0"></iframe>
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>No</th> <th>No</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-select select2" name="jenis"> <select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option> <option selected>Pilih Jenis</option>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<center> <center>
<h1 class="display-5">Selamat Datang di SIM PKM </h1> <h1 class="display-5">Selamat Datang di SIM PMW </h1>
<h1 class="display-6 text-primary">(Sistem Informasi Manajemen Program Kreativitas Mahasiswa )</h1> <h1 class="display-6 text-primary">(Sistem Informasi Manajemen Program Mahasiswa Wirausaha )</h1>
<h1 class="display-7 text-warning">Universitas Negeri Surabaya</h1> <h1 class="display-7 text-warning">Universitas Negeri Surabaya</h1>
</center> </center>
</div> </div>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<td>{{ $loop->iteration }}</td> <td>{{ $loop->iteration }}</td>
<td>{{ $item->jenis_luaran }}</td> <td>{{ $item->jenis_luaran }}</td>
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
<td><a href="https://statik.unesa.ac.id/simpkm/luaran/{{ $item->jenis_luaran }}/{{ $item->file_luaran }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a></td> <td><a href="https://statik.unesa.ac.id/simpmw/luaran/{{ $item->jenis_luaran }}/{{ $item->file_luaran }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a></td>
<td> <td>
<a onclick="hapus('{{ encrypt($item->id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a> <a onclick="hapus('{{ encrypt($item->id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a>
</td> </td>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Catatan Harian (Logbook)</th> <th>Catatan Harian (Logbook)</th>
<th>Laporan Kemajuan</th> <th>Laporan Kemajuan</th>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</tr> </tr>
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td> <td> <iframe id="view-pdf" width="100%" height="200px" src="https://statik.unesa.ac.id/simpmw/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe></td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th> <th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th> <th width="10%">Laporan Kemajuan</th>
...@@ -82,14 +82,14 @@ ...@@ -82,14 +82,14 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__logbook__I')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__logbook__I')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/I/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/I/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->kemajuan_file)) @if(is_null($item->kemajuan_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__kemajuan__I')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__kemajuan__I')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/I/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/I/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th> <th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th> <th width="10%">Laporan Kemajuan</th>
...@@ -82,14 +82,14 @@ ...@@ -82,14 +82,14 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__logbook__II')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__logbook__II')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/II/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/II/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->kemajuan_file)) @if(is_null($item->kemajuan_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__kemajuan__II')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__kemajuan__II')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/II/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/II/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th width="10%">Catatan Harian (Logbook)</th> <th width="10%">Catatan Harian (Logbook)</th>
<th width="10%">Laporan Kemajuan</th> <th width="10%">Laporan Kemajuan</th>
...@@ -83,21 +83,21 @@ ...@@ -83,21 +83,21 @@
@if(is_null($item->logbook_file)) @if(is_null($item->logbook_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__logbook__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__logbook__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/logbook/{{ $item->logbook_file }}" target="_blank" title="Logbook" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->laporan_kemajuan_file)) @if(is_null($item->laporan_kemajuan_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__kemajuan__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__kemajuan__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/kemajuan/{{ $item->kemajuan_file }}" target="_blank" title="Laporan Kemajuan" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->laporan_akhir_file)) @if(is_null($item->laporan_akhir_file))
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__akhir__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->proposal_id.'__akhir__III')) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-file-upload"></i> Upload</a>
@else @else
<a href="https://statik.unesa.ac.id/simpkm/monev/III/akhir/{{ $item->akhir_file }}" target="_blank" title="Laporan Akhir" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a> <a href="https://statik.unesa.ac.id/simpmw/monev/III/akhir/{{ $item->akhir_file }}" target="_blank" title="Laporan Akhir" class="btn btn-info btn-sm waves-effect waves-light"> <i class="fas fa-search"></i> Lihat</a>
@endif @endif
</td> </td>
<td> <td>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<td colspan="2">{{ $item->rProposal->judul }}</td> <td colspan="2">{{ $item->rProposal->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td colspan="2">{{ $item->rProposal->rJenis->nama }}</td> <td colspan="2">{{ $item->rProposal->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<label class="col-sm-10 col-form-label">{{ $proposal->rProposal->judul }}</label> <label class="col-sm-10 col-form-label">{{ $proposal->rProposal->judul }}</label>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-10 col-form-label">{{ $proposal->rProposal->rJenis->nama }}</label> <label class="col-sm-10 col-form-label">{{ $proposal->rProposal->rJenis->nama }}</label>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-select select2" name="jenis"> <select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option> <option selected>Pilih Jenis</option>
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<div class="col-sm-8 col-lg-8"> <div class="col-sm-8 col-lg-8">
@if ($errors->has('file')) <span class="text-danger">{{ $errors->first('file') }}</span> @endif @if ($errors->has('file')) <span class="text-danger">{{ $errors->first('file') }}</span> @endif
<input type="file" name="file" class="form-control" id="input-file" accept="application/pdf"> <input type="file" name="file" class="form-control" id="input-file" accept="application/pdf">
<<<<<<< HEAD
{{-- <iframe id="view-pdf" width="80%" height="80%" frameborder="0" src="{{ $proposal ? 'https://statik.unesa.ac.id/simpkm/proposal/'.$proposal->rPeriode->nama.'/'.$proposal->upload_dokumen : '' }} "></iframe> --}} {{-- <iframe id="view-pdf" width="80%" height="80%" frameborder="0" src="{{ $proposal ? 'https://statik.unesa.ac.id/simpkm/proposal/'.$proposal->rPeriode->nama.'/'.$proposal->upload_dokumen : '' }} "></iframe> --}}
</div> </div>
<div class="col-sm-2 col-lg-2"> <div class="col-sm-2 col-lg-2">
...@@ -80,6 +81,9 @@ ...@@ -80,6 +81,9 @@
<div class="col-sm-2 col-lg-2"></div> <div class="col-sm-2 col-lg-2"></div>
<div class="col-sm-10 col-lg-10"> <div class="col-sm-10 col-lg-10">
<textarea class="form-control" type="text" id="deskripsi" name="deskripsi" value="{{ old('deskripsi') }}" placeholder="Deskripsi..." required></textarea> <textarea class="form-control" type="text" id="deskripsi" name="deskripsi" value="{{ old('deskripsi') }}" placeholder="Deskripsi..." required></textarea>
=======
<iframe id="view-pdf" width="80%" height="80%" frameborder="0" src="{{ $proposal ? 'https://statik.unesa.ac.id/simpmw/proposal/'.$proposal->rPeriode->nama.'/'.$proposal->upload_dokumen : '' }} "></iframe>
>>>>>>> f50572854f87f0e3e0e9be1c6be0a2fb241bd85c
</div> </div>
</div> </div>
<div class="mb-0"> <div class="mb-0">
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<th width="5%">Kode Kelompok</th> <th width="5%">Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<th>Proposal</th> <th>Proposal</th>
<td> <td>
@if($item->upload_dokumen) @if($item->upload_dokumen)
<a href="https://statik.unesa.ac.id/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> <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/simpkm/proposal/{{ $item->rPeriode->nama }}/{{ $item->upload_dokumen }}" frameborder="0"></iframe> <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 @else
<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> <div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong> File tidak ditemukan. <strong>Informasi!</strong> File tidak ditemukan.
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
</tr> </tr>
<tr> <tr>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
</tr> </tr>
<tr> <tr>
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
<tr> <tr>
<th>Proposal</th> <th>Proposal</th>
<td> <td>
<a href="https://statik.unesa.ac.id/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" target="_blank" class="btn btn-success btn-sm"> <i class="far fa-eye"></i> Lihat Proposal</a> <a href="https://statik.unesa.ac.id/simpmw/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->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/simpkm/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" frameborder="0"></iframe> <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpmw/proposal/revisi/{{ $item->rPeriode->nama }}/{{ $item->rBelmawa->upload_dokumen }}" frameborder="0"></iframe>
</td> </td>
</tr> </tr>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-select select2" name="jenis"> <select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option> <option selected>Pilih Jenis</option>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<label class="col-sm-10 col-form-label">{{ $proposal->judul }}</label> <label class="col-sm-10 col-form-label">{{ $proposal->judul }}</label>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<label class="col-sm-10 col-form-label">{{ $proposal->rJenis->nama }}</label> <label class="col-sm-10 col-form-label">{{ $proposal->rJenis->nama }}</label>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="row"> <div class="row">
<label class="col-sm-3 col-form-label">Jenis PKM : </label> <label class="col-sm-3 col-form-label">Jenis PMW : </label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm"> <select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option> <option value="0">Semua</option>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<tr> <tr>
<th>id</th> <th>id</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Dosen Pembimbing</th> <th>Dosen Pembimbing</th>
<th>Proposal</th> <th>Proposal</th>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<tr> <tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td> <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>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PKM</strong></td> <td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</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>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td> <td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<tr> <tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td> <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>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PKM</strong></td> <td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</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>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td> <td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="row"> <div class="row">
<label class="col-sm-3 col-form-label">Jenis PKM : </label> <label class="col-sm-3 col-form-label">Jenis PMW : </label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm"> <select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option> <option value="0">Semua</option>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<tr> <tr>
<th rowspan="2">id</th> <th rowspan="2">id</th>
<th rowspan="2" width='5%'>Kode Kelompok</th> <th rowspan="2" width='5%'>Kode Kelompok</th>
<th rowspan="2" width='15%'>Jenis PKM</th> <th rowspan="2" width='15%'>Jenis PMW</th>
<th rowspan="2" width='20%'>Judul Proposal</th> <th rowspan="2" width='20%'>Judul Proposal</th>
<th rowspan="2" width='10%'>Dosen Pembimbing</th> <th rowspan="2" width='10%'>Dosen Pembimbing</th>
<th rowspan="2" width='15%'>Reviewer 1</th> <th rowspan="2" width='15%'>Reviewer 1</th>
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
var isi = this.value; var isi = this.value;
Swal.fire({ Swal.fire({
title: "Apakah Anda Yakin?", title: "Apakah Anda Yakin?",
text: "Anda akan meruhan jenis PKM ini?!", text: "Anda akan meruhan jenis PMW ini?!",
icon: "warning", icon: "warning",
showCancelButton: !0, showCancelButton: !0,
confirmButtonText: "Ya, Ubah Jenis", confirmButtonText: "Ya, Ubah Jenis",
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="row"> <div class="row">
<label class="col-sm-3 col-form-label">Jenis PKM : </label> <label class="col-sm-3 col-form-label">Jenis PMW : </label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm"> <select class="form-select select2" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option> <option value="0">Semua</option>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<tr> <tr>
<th rowspan="2">id</th> <th rowspan="2">id</th>
<th rowspan="2">Kode Kelompok</th> <th rowspan="2">Kode Kelompok</th>
<th rowspan="2">Jenis PKM</th> <th rowspan="2">Jenis PMW</th>
<th rowspan="2">Judul Proposal</th> <th rowspan="2">Judul Proposal</th>
<th rowspan="2">Dosen Pembimbing</th> <th rowspan="2">Dosen Pembimbing</th>
<th rowspan="2">Reviewer 1</th> <th rowspan="2">Reviewer 1</th>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h6 class="page-title">{!! $title !!}</h6> <h6 class="page-title">{!! $title !!}</h6>
<ol class="breadcrumb m-0"> <ol class="breadcrumb m-0">
<li class="breadcrumb-item">Setting</li> <li class="breadcrumb-item">Setting</li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PKM</a></li> <li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PMW</a></li>
<li class="breadcrumb-item">{!! $title !!}</li> <li class="breadcrumb-item">{!! $title !!}</li>
</ol> </ol>
</div> </div>
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
{!! Form::open(array('url' => route('operator.jenis.store'), 'method' => 'POST', 'id' => 'ff', 'class' => 'form-horizontal')) !!} {!! Form::open(array('url' => route('operator.jenis.store'), 'method' => 'POST', 'id' => 'ff', 'class' => 'form-horizontal')) !!}
{!! csrf_field() !!} {!! csrf_field() !!}
<div class="row mb-3"> <div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PKM</label> <label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
{{ Form::text('nama', old('nama'), array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PKM')) }} {{ Form::text('nama', old('nama'), array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PMW')) }}
@if ($errors->has('nama')) @if ($errors->has('nama'))
<span class="help-block">{{$errors->first('nama')}}</span> <span class="help-block">{{$errors->first('nama')}}</span>
@endif @endif
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<h6 class="page-title">{!! $title !!}</h6> <h6 class="page-title">{!! $title !!}</h6>
<ol class="breadcrumb m-0"> <ol class="breadcrumb m-0">
<li class="breadcrumb-item">Setting</li> <li class="breadcrumb-item">Setting</li>
<li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PKM</a></li> <li class="breadcrumb-item"><a href="{{ URL::to('operator/jenis') }}">Jenis PMW</a></li>
<li class="breadcrumb-item">{!! $title !!}</li> <li class="breadcrumb-item">{!! $title !!}</li>
</ol> </ol>
</div> </div>
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
{!! Form::model($jenis, ['route' => ['operator.jenis.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!} {!! Form::model($jenis, ['route' => ['operator.jenis.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!} {!! csrf_field() !!}
<div class="row mb-3"> <div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PKM</label> <label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
{{ Form::text('nama', null, array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PKM')) }} {{ Form::text('nama', null, array('class' => 'form-control', 'placeholder' => 'Masukkan Jenis PMW')) }}
@if ($errors->has('nama')) @if ($errors->has('nama'))
<span class="help-block">{{$errors->first('nama')}}</span> <span class="help-block">{{$errors->first('nama')}}</span>
@endif @endif
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<thead> <thead>
<tr> <tr>
<th>id</th> <th>id</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Deskripsi</th> <th>Deskripsi</th>
<th>Aksi</th> <th>Aksi</th>
</tr> </tr>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
{!! Form::model($jenis, ['route' => ['operator.jenis-penilaian-monev.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!} {!! Form::model($jenis, ['route' => ['operator.jenis-penilaian-monev.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!} {!! csrf_field() !!}
<div class="row mb-3"> <div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Jenis PKM </label> <label for="example-text-input" class="col-sm-2 col-form-label">Jenis PMW </label>
<div class="col-sm-10"> <div class="col-sm-10">
<label for="example-text-input" class="col-sm-2 col-form-label">: {{ $jenis->nama }}</label> <label for="example-text-input" class="col-sm-2 col-form-label">: {{ $jenis->nama }}</label>
</div> </div>
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
<thead> <thead>
<tr> <tr>
<th scope="col" width="75%">Komponen</th> <th scope="col" width="75%">Komponen</th>
<th scope="col" width="10%">Bobot</th>
<th scope="col" width="15%">Aksi</th> <th scope="col" width="15%">Aksi</th>
</tr> </tr>
</thead> </thead>
...@@ -67,12 +66,10 @@ ...@@ -67,12 +66,10 @@
@foreach ($jenis_penilaian_monev as $key => $val) @foreach ($jenis_penilaian_monev as $key => $val)
<tr> <tr>
<td> <td>
<input type="hidden" class="form-control" name="jenis_penilaian_monev_id[]" required value="{{ encrypt($val->jenis_penilaian_monev_id) }}">
<input type="text" class="form-control" name="nama[]" required value="{{ $val->nama }}"> <input type="text" class="form-control" name="nama[]" required value="{{ $val->nama }}">
</td> </td>
<td> <td>
<input class="form-control input-mask reqBobot" data-inputmask="'mask': '9', 'repeat': 3, 'greedy' : false" name="bobot[]" maxlength="3" value="{{ $val->bobot }}">
</td>
<td>
<a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a> <a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a>
</td> </td>
</tr> </tr>
...@@ -83,27 +80,11 @@ ...@@ -83,27 +80,11 @@
<input type="text" class="form-control" name="nama[]" required> <input type="text" class="form-control" name="nama[]" required>
</td> </td>
<td> <td>
<input class="form-control input-mask reqBobot" data-inputmask="'mask': '9', 'repeat': 3, 'greedy' : false" name="bobot[]" maxlength="3">
</td>
<td>
<a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a> <a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a>
</td> </td>
</tr> </tr>
@endif @endif
</tbody> </tbody>
<tfoot>
<tr>
<td style="text-align: right">
<label>TOTAL BOBOT <span class="badge bg-info">(total bobot harus 100)</span></label>
</td>
<td>
<input class="form-control reqBobotTotal" readonly>
</td>
<td>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
...@@ -162,33 +143,7 @@ ...@@ -162,33 +143,7 @@
function submitForm() function submitForm()
{ {
var sum = hitung();
if(sum != '100')
{
Swal.fire({
title: "Gagal",
text: "Total Bobot harus 100",
icon: "error",
confirmButtonColor: "#556ee6"
});
}
else
{
$('#btnSubmit').click(); $('#btnSubmit').click();
} }
}
function hitung()
{
var sum = 0;
$(".reqBobot").each(function(){
sum += +$(this).val();
});
$(".reqBobotTotal").val(sum);
return sum;
}
</script> </script>
@endsection @endsection
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<thead> <thead>
<tr> <tr>
<th>id</th> <th>id</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Deskripsi</th> <th>Deskripsi</th>
<th>Jumlah Komponen</th> <th>Jumlah Komponen</th>
<th>Aksi</th> <th>Aksi</th>
......
...@@ -11,12 +11,10 @@ ...@@ -11,12 +11,10 @@
validate: !0 validate: !0
}); });
</script> </script>
<input type="hidden" class="form-control" name="jenis_penilaian_monev_id[]" required value="{{ encrypt(Uuid::generate()) }}">
<input type="text" class="form-control" name="nama[]" required> <input type="text" class="form-control" name="nama[]" required>
</td> </td>
<td> <td>
<input class="form-control input-mask reqBobot" data-inputmask="'mask': '9', 'repeat': 3, 'greedy' : false" name="bobot[]" maxlength="3">
</td>
<td>
<a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a> <a onclick="$(this).parent().parent().remove();" class="btn btn-danger btn-sm btn-delete">Delete</a>
</td> </td>
</tr> </tr>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
@if ($errors->has('file')) <span class="text-danger">{{ $errors->first('file') }}</span> @endif @if ($errors->has('file')) <span class="text-danger">{{ $errors->first('file') }}</span> @endif
<input type="file" name="file" class="form-control" id="input-file"> <input type="file" name="file" class="form-control" id="input-file">
<iframe id="view-pdf" width="80%" height="100%" src="{{ $pengumuman ? 'https://statik.unesa.ac.id/simpkm/pengumuman/'.$pengumuman->file : '' }}" frameborder="0"></iframe> <iframe id="view-pdf" width="80%" height="100%" src="{{ $pengumuman ? 'https://statik.unesa.ac.id/simpmw/pengumuman/'.$pengumuman->file : '' }}" frameborder="0"></iframe>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<tr> <tr>
<td style="border: 1px solid #000000;"><strong>No</strong></td> <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>Kode Kelompok</strong></td>
<td style="border: 1px solid #000000;"><strong>Jenis PKM</strong></td> <td style="border: 1px solid #000000;"><strong>Jenis PMW</strong></td>
<td style="border: 1px solid #000000;"><strong>Fak.</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>Nama</strong></td>
<td style="border: 1px solid #000000;"><strong>NIM</strong></td> <td style="border: 1px solid #000000;"><strong>NIM</strong></td>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="row"> <div class="row">
<label class="col-sm-3 col-form-label">Jenis PKM : </label> <label class="col-sm-3 col-form-label">Jenis PMW : </label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-select" name="reqJenisPkm" id="reqJenisPkm"> <select class="form-select" name="reqJenisPkm" id="reqJenisPkm">
<option value="0">Semua</option> <option value="0">Semua</option>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas Dosen Pembimbing</th> <th>Identitas Dosen Pembimbing</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Identitas Ketua</th> <th>Identitas Ketua</th>
<th>Identitas <br>Dosen Pembimbing</th> <th>Identitas <br>Dosen Pembimbing</th>
<th>Jenis <br>PKM</th> <th>Jenis <br>PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Catatan Harian <br>(Logbook)</th> <th>Catatan Harian <br>(Logbook)</th>
<th>Laporan <br>Kemajuan</th> <th>Laporan <br>Kemajuan</th>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
<span>{{ $monev ? $monev->jenis_pkm : '' }}</span> <span>{{ $monev ? $monev->jenis_pkm : '' }}</span>
</div> </div>
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<tr> <tr>
<th>id</th> <th>id</th>
<th>Kode Kelompok</th> <th>Kode Kelompok</th>
<th>Jenis PKM</th> <th>Jenis PMW</th>
<th>Judul Proposal</th> <th>Judul Proposal</th>
<th>Status</th> <th>Status</th>
<th>Proposal</th> <th>Proposal</th>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Jenis PKM</label> <label class="col-sm-2 col-form-label">Jenis PMW</label>
<div class="col-sm-10"> <div class="col-sm-10">
<span>{{ $proposal ? $proposal->jenis_pkm : '' }}</span> <span>{{ $proposal ? $proposal->jenis_pkm : '' }}</span>
</div> </div>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<label for="kode" class="col-sm-2 col-form-label">Proposal</label> <label for="kode" class="col-sm-2 col-form-label">Proposal</label>
<div class="col-sm-10"> <div class="col-sm-10">
@if($proposal->upload_dokumen) @if($proposal->upload_dokumen)
<iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpkm/proposal/{{ $proposal->periode }}/{{ $proposal->upload_dokumen }}" frameborder="0"></iframe> <iframe id="view-pdf" width="100%" height="400px" src="https://statik.unesa.ac.id/simpmw/proposal/{{ $proposal->periode }}/{{ $proposal->upload_dokumen }}" frameborder="0"></iframe>
@else @else
<div class="alert alert-danger alert-dismissible fade show mb-0" role="alert"> <div class="alert alert-danger alert-dismissible fade show mb-0" role="alert">
<strong>Informasi!</strong> File tidak ditemukan. <strong>Informasi!</strong> File tidak ditemukan.
...@@ -57,15 +57,26 @@ ...@@ -57,15 +57,26 @@
@endif @endif
</div> </div>
</div> </div>
<div class="row mb-3" class="dropzone">
<label for="kode" class="col-sm-2 col-form-label">Tautan</label>
<div class="col-sm-10">
<ul>
@foreach ($proposal->proposalUrl as $item)
<li>
<a class="btn btn-link" href="{{ $item->url }}">{{ $item->url_name }}</a>
<p>{{ $item->deskripsi }}</p>
</li>
@endforeach
</ul>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<label for="kode" class="col-sm-2 col-form-label">Komponen Penilaian : </label> <label for="kode" class="col-sm-2 col-form-label">Komponen Penilaian : </label>
<div class="col-sm-10"> <div class="col-sm-10">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr style="text-align: center"> <tr style="text-align: center">
<th style="width: 70%">Komponen</th> <th>Komponen</th>
<th style="width: 10%">Bobot</th>
<th style="width: 10%">Skor</th>
<th style="width: 10%">Nilai</th> <th style="width: 10%">Nilai</th>
</tr> </tr>
</thead> </thead>
...@@ -87,18 +98,14 @@ ...@@ -87,18 +98,14 @@
<input type="hidden" name="jenis_penilaian_id[]" value="{{ $val->jenis_penilaian_monev_id }}"> <input type="hidden" name="jenis_penilaian_id[]" value="{{ $val->jenis_penilaian_monev_id }}">
<span>{{ $val->nama }}</span> <span>{{ $val->nama }}</span>
</td> </td>
<td><span id="varBobot-{{ $val->jenis_penilaian_monev_id }}">{{ $val->bobot }}</span></td>
<td> <td>
<select name="skor[]" class="hitung_skor" data-id="{{ $val->jenis_penilaian_monev_id }}"> <select name="skor[]" class="hitung_skor" data-id="{{ $val->jenis_penilaian_monev_id }}">
<option value="1" @if($skor == '1') selected="selected" @endif>1</option> <option value="1" @if($skor == '1') selected="selected" @endif>1</option>
<option value="2" @if($skor == '2') selected="selected" @endif>2</option> <option value="2" @if($skor == '2') selected="selected" @endif>2</option>
<option value="3" @if($skor == '3') selected="selected" @endif>3</option> <option value="3" @if($skor == '3') selected="selected" @endif>3</option>
<option value="5" @if($skor == '5') selected="selected" @endif>5</option> <option value="5" @if($skor == '5') selected="selected" @endif>5</option>
<option value="6" @if($skor == '6') selected="selected" @endif>6</option>
<option value="7" @if($skor == '7') selected="selected" @endif>7</option>
</select> </select>
</td> </td>
<td><span id='varNilai-{{ $val->jenis_penilaian_monev_id }}' class="clsNilai">{{ $nilai }}</span></td>
</tr> </tr>
@php @php
$total += $nilai; $total += $nilai;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<meta name="geo.position" content="-7.300818;112.672689"> <meta name="geo.position" content="-7.300818;112.672689">
<meta name="geo.placename" content="Surabaya"> <meta name="geo.placename" content="Surabaya">
<meta name="geo.region" content="Indonesia"> <meta name="geo.region" content="Indonesia">
<title>SIM PKM UNESA | Sistem Informasi Manajemen Program Kreativitas Mahasiswa</title> <title>SIM PMW UNESA | Sistem Informasi Manajemen Program Kreativitas Mahasiswa</title>
<!-- App favicon --> <!-- App favicon -->
<link rel="shortcut icon" href="{{ asset('theme/images/favicon.ico') }}"> <link rel="shortcut icon" href="{{ asset('theme/images/favicon.ico') }}">
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
© <script>document.write(new Date().getFullYear())</script> SIM PKM<span class="d-none d-sm-inline-block"> - Crafted with <i class="mdi mdi-heart text-danger"></i> by PPTI.</span> © <script>document.write(new Date().getFullYear())</script> SIM PMW<span class="d-none d-sm-inline-block"> - Crafted with <i class="mdi mdi-heart text-danger"></i> by PPTI.</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<li class="{{ (request()->is('operator/jenis/*')) ? 'mm-active' : '' }}"> <li class="{{ (request()->is('operator/jenis/*')) ? 'mm-active' : '' }}">
<a href="{{ URL::to('operator/jenis') }}" class="waves-effect"> <a href="{{ URL::to('operator/jenis') }}" class="waves-effect">
<i class="ti-home"></i> <i class="ti-home"></i>
<span>Jenis PKM</span> <span>Jenis PMW</span>
</a> </a>
</li> </li>
<li class="{{ (request()->is('operator/jenis-penilaian-monev/*')) ? 'mm-active' : '' }}"> <li class="{{ (request()->is('operator/jenis-penilaian-monev/*')) ? 'mm-active' : '' }}">
......
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