Commit 794dd12c by Novan Bagus Setiawan

update excel + perbaiki query

parent 6883c484
...@@ -23,6 +23,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -23,6 +23,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
public function view(): View public function view(): View
{ {
ini_set('memory_limit', '-1');
$statement = " STATUS_HAPUS = '0' "; $statement = " STATUS_HAPUS = '0' ";
if($this->jenis != "0") if($this->jenis != "0")
...@@ -47,7 +48,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -47,7 +48,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
->selectRaw(" round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata ")->whereRaw($statement)->get(); ->selectRaw(" round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata ")->whereRaw($statement)->get();
$result = []; $result = [];
$no = 0; $x =0;
$dospem = ''; $dospem = '';
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
// $dospem = "(".str_replace("###",") ",$value->identitas_dospem); // $dospem = "(".str_replace("###",") ",$value->identitas_dospem);
...@@ -64,6 +65,8 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -64,6 +65,8 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
$status_final = "Menunggu Persetujuan"; $status_final = "Menunggu Persetujuan";
$urut = 1; $urut = 1;
$det = array();
$no = 0;
foreach ($value->rKelompokDetil as $keys => $detil) { foreach ($value->rKelompokDetil as $keys => $detil) {
if($detil->status_ketua == '1') if($detil->status_ketua == '1')
...@@ -76,23 +79,27 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -76,23 +79,27 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
$urut++; $urut++;
} }
$result[$no]['rowspan'] = count($value->rKelompokDetil); $det[$no]['fak'] = $detil->fakultas;
$result[$no]['kode'] = $value->kode; $det[$no]['nama'] = $detil->nama;
$result[$no]['jenis'] = $value->jenis_pkm; $det[$no]['nim']= $detil->nim;
$result[$no]['fak'] = $detil->fakultas; $det[$no]['keanggotaan'] = $keanggotaan;
$result[$no]['nama'] = $detil->nama;
$result[$no]['nim'] = $detil->nim;
$result[$no]['keanggotaan'] = $keanggotaan;
$result[$no]['judul'] = $value->judul;
$result[$no]['dospem'] = $dospem;
$result[$no]['link'] = $url;
$result[$no]['status'] = $status_final;
$result[$no]['rata'] = $value->rata;
$result[$no]['email_dospem'] = end($data_dospem);
$result[$no]['email_ketua'] = end($data_ketua);
$no++; $no++;
} }
$result[$x]['rowspan'] = count($value->rKelompokDetil);
$result[$x]['kode'] = $value->kode;
$result[$x]['jenis'] = $value->jenis_pkm;
$result[$x]['detil'] = $det;
$result[$x]['judul'] = $value->judul;
$result[$x]['dospem'] = $dospem;
$result[$x]['link'] = $url;
$result[$x]['status'] = $status_final;
$result[$x]['rata'] = $value->rata;
$result[$x]['email_dospem'] = end($data_dospem);
$result[$x]['email_ketua'] = end($data_ketua);
$x++;
} }
$datas['list_proposal'] = $result; $datas['list_proposal'] = $result;
......
...@@ -41,8 +41,8 @@ class DaftarProposalController extends Controller ...@@ -41,8 +41,8 @@ class DaftarProposalController extends Controller
/* AJAX request */ /* AJAX request */
public function getData(Request $request){ public function getData(Request $request){
$periode = Periode::where('status', 1)->first(); // $periode = Periode::where('status', 1)->first();
$reqPeriodeId = $periode->periode_id; // $reqPeriodeId = $periode->periode_id;
// parameter // parameter
$jenis= $request->get('jenis'); $jenis= $request->get('jenis');
...@@ -68,41 +68,47 @@ class DaftarProposalController extends Controller ...@@ -68,41 +68,47 @@ class DaftarProposalController extends Controller
$searchValue = strtoupper($search_arr['value']); // Search value $searchValue = strtoupper($search_arr['value']); // Search value
// Total records // Total records
$statementGlobal = " 1=1 "; // $statementGlobal = " 1=1 ";
$statementGlobal = " ";
if($jenis != "0") if($jenis != "0")
{ {
$statementGlobal .= " AND JENIS_ID = '".$jenis."'"; $statementGlobal .= " AND JENIS_ID = ''".$jenis."''";
} }
if($status != "0") if($status != "0")
{ {
// dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan // dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan
$status = $status - 1; $status = $status - 1;
$statementGlobal .= " AND STATUS_FINAL = '".$status."'"; $statementGlobal .= " AND STATUS_FINAL = ''".$status."''";
} }
if($tahun != "0") if($tahun != "0")
{ {
$statementGlobal .= " AND PERIODE = '".$tahun."'"; $statementGlobal .= " AND PERIODE = ''".$tahun."''";
} }
$totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count(); // $totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count();
$statement = " AND (UPPER(JUDUL) LIKE '%".$searchValue."%' OR UPPER(IDENTITAS_DOSPEM) LIKE '%".$searchValue."%') "; $totalRecords = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$statementGlobal."') "))->count();
$statement = " AND (UPPER(JUDUL) LIKE ''%".$searchValue."%'' OR UPPER(IDENTITAS_DOSPEM) LIKE ''%".$searchValue."%'') ";
$totalRecordswithFilter = DaftarProposal::select('count(1) as allcount') // $totalRecordswithFilter = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal.$statement)->count();
->whereRaw($statementGlobal.$statement)->count(); $totalRecordswithFilter = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$statementGlobal.$statement."') "))->count();
// Fetch records // Fetch records
$records = DaftarProposal::orderBy($columnName,$columnSortOrder) // $records = DaftarProposal::orderBy($columnName,$columnSortOrder)
->whereRaw($statementGlobal.$statement) // ->whereRaw($statementGlobal.$statement)
->select('daftar_proposal.*') // ->select('daftar_proposal.*')
->selectRaw(" ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) nilai_1 ") // ->selectRaw(" ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) nilai_1 ")
->selectRaw(" ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2) nilai_2 ") // ->selectRaw(" ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2) nilai_2 ")
->selectRaw(" round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata ") // ->selectRaw(" round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata ")
// ->skip($start)
// ->take($rowperpage)
// ->get();
$records = collect(DB::select("select *, ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) nilai_1, ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2) nilai_2, round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata from vw_daftar_proposal('".$statementGlobal.$statement."') ORDER BY ".$columnName." ".$columnSortOrder))
->skip($start) ->skip($start)
->take($rowperpage) ->take($rowperpage);
->get();
$data_arr = array(); $data_arr = array();
foreach($records as $record){ foreach($records as $record){
...@@ -112,7 +118,7 @@ class DaftarProposalController extends Controller ...@@ -112,7 +118,7 @@ class DaftarProposalController extends Controller
$jenis_pkm = $record->jenis_pkm; $jenis_pkm = $record->jenis_pkm;
$judul = $record->judul; $judul = $record->judul;
$dospem = "(".str_replace("###",") ",$record->identitas_dospem); $dospem = "(".str_replace("###",") ",$record->identitas_dospem);
$status_administrasi_1 = $record->status_administrasi_1; $status_administrasi_1 = $record->status_administrasi;
$status_administrasi_2 = $record->status_administrasi_2; $status_administrasi_2 = $record->status_administrasi_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;
...@@ -618,4 +624,95 @@ class DaftarProposalController extends Controller ...@@ -618,4 +624,95 @@ class DaftarProposalController extends Controller
return Excel::download(new DaftarProposalBelmawaExport($jenis, $status, $tahun), 'seleksi_belmawa_export.xlsx'); return Excel::download(new DaftarProposalBelmawaExport($jenis, $status, $tahun), 'seleksi_belmawa_export.xlsx');
} }
public function cetak_daftar_proposal_new(Request $request)
{
$jenis = $request->jenis;
$status = $request->status;
$tahun= $request->tahun;
ini_set('memory_limit', '-1');
$statement = " STATUS_HAPUS = '0' ";
if($jenis != "0")
{
$statement .= " AND jenis_id = '".$jenis."'";
}
if($status != "0")
{
// dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan
$status = $status - 1;
$statement .= " AND STATUS_FINAL = '".$status."'";
}
if($tahun != "0")
{
$statement .= " AND PERIODE = '".$tahun."'";
}
$data = DaftarProposal::with('rKelompokDetil')
->select("*")
->selectRaw(" round((ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_1) + ambil_jumlah_penilaian_seleksi(reviewer_proposal_id_2 )) / 2, 2) as rata ")->whereRaw($statement)->get();
$result = [];
$x =0;
$dospem = '';
foreach ($data as $key => $value) {
// $dospem = "(".str_replace("###",") ",$value->identitas_dospem);
$data_dospem = explode('###', $value->identitas_dospem);
$data_ketua = explode('###', $value->identitas_ketua);
$dospem = "(".$data_dospem[0].") ".$data_dospem[1];
$url = "https://statik.unesa.ac.id/simpkm/proposal/".$value->periode."/".$value->upload_dokumen;
if($value->status_final == '1')
$status_final = "Lolos";
elseif($value->status_final == '2')
$status_final = "Tidak Lolos";
else
$status_final = "Menunggu Persetujuan";
$urut = 1;
$det = array();
$no = 0;
foreach ($value->rKelompokDetil as $keys => $detil) {
if($detil->status_ketua == '1')
{
$keanggotaan = "Ketua";
}
else
{
$keanggotaan = "Anggota ".$urut;
$urut++;
}
$det[$no]['fak'] = $detil->fakultas;
$det[$no]['nama'] = $detil->nama;
$det[$no]['nim']= $detil->nim;
$det[$no]['keanggotaan'] = $keanggotaan;
$no++;
}
$result[$x]['rowspan'] = count($value->rKelompokDetil);
$result[$x]['kode'] = $value->kode;
$result[$x]['jenis'] = $value->jenis_pkm;
$result[$x]['detil'] = $det;
$result[$x]['judul'] = $value->judul;
$result[$x]['dospem'] = $dospem;
$result[$x]['link'] = $url;
$result[$x]['status'] = $status_final;
$result[$x]['rata'] = $value->rata;
$result[$x]['email_dospem'] = end($data_dospem);
$result[$x]['email_ketua'] = end($data_ketua);
$x++;
}
$datas['list_proposal'] = $result;
$datas['jenis_monev'] = 'Seleksi Internal';
return view('backend.operator.daftar_proposal.excel_new', $datas);
}
} }
...@@ -71,36 +71,36 @@ class DaftarSeleksiController extends Controller ...@@ -71,36 +71,36 @@ class DaftarSeleksiController extends Controller
$searchValue = strtoupper($search_arr['value']); // Search value $searchValue = strtoupper($search_arr['value']); // Search value
// Total records // Total records
$statement = " AND (UPPER(JUDUL) LIKE '%".$searchValue."%') "; $statement = " AND (UPPER(JUDUL) LIKE ''%".$searchValue."%'') ";
// $statementGlobal = " 1=1 AND (NIDN_REVIEWER_ID_1 = '".$noidentitas."' OR NIDN_REVIEWER_ID_2 = '".$noidentitas."')"; // $statementGlobal = " 1=1 AND (NIDN_REVIEWER_ID_1 = '".$noidentitas."' OR NIDN_REVIEWER_ID_2 = '".$noidentitas."')";
$statementGlobal = " 1=1 "; $statementGlobal = " ";
if($administrasi != "0") if($administrasi != "0")
{ {
// dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan // dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan
$administrasi = $administrasi - 1; $administrasi = $administrasi - 1;
$statementGlobal .= " AND (ambil_data_reviewer_proposal ( '".$noidentitas."', proposal_id, '3' ) = '".$administrasi."')"; $statementGlobal .= " AND (ambil_data_reviewer_proposal ( ''".$noidentitas."'', proposal_id, ''3'' ) = ''".$administrasi."'')";
} }
if($status != "0") if($status != "0")
{ {
// dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan // dikurang 1 karena di view mulai dari 0 sedangkan 0 itu menunggu persetujuan
$status = $status - 1; $status = $status - 1;
$statementGlobal .= " AND (ambil_data_reviewer_proposal ( '".$noidentitas."', proposal_id, '2' ) = '".$status."')"; $statementGlobal .= " AND (ambil_data_reviewer_proposal ( ''".$noidentitas."'', proposal_id, ''2'' ) = ''".$status."'')";
} }
if($tahun != "0") if($tahun != "0")
{ {
$statementGlobal .= " AND PERIODE = '".$tahun."'"; $statementGlobal .= " AND PERIODE = ''".$tahun."''";
} }
// $totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count(); // $totalRecords = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal)->count();
$totalRecords = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$noidentitas."') where ".$statementGlobal))->count(); $totalRecords = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$statementGlobal."', '".$noidentitas."') "))->count();
// $totalRecordswithFilter = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal.$statement)->count(); // $totalRecordswithFilter = DaftarProposal::select('count(1) as allcount')->whereRaw($statementGlobal.$statement)->count();
$totalRecordswithFilter = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$noidentitas."') WHERE ".$statementGlobal.$statement))->count(); $totalRecordswithFilter = collect(DB::select("select 1 as allcount from vw_daftar_proposal('".$statementGlobal.$statement."', '".$noidentitas."') "))->count();
// echo "select 1 as allcount from vw_daftar_proposal('".$statementGlobal.$statement."', '".$noidentitas."')"; exit;
// Fetch records // Fetch records
// $records = DaftarProposal::orderBy($columnName,$columnSortOrder) // $records = DaftarProposal::orderBy($columnName,$columnSortOrder)
// ->whereRaw($statementGlobal.$statement) // ->whereRaw($statementGlobal.$statement)
...@@ -108,7 +108,7 @@ class DaftarSeleksiController extends Controller ...@@ -108,7 +108,7 @@ class DaftarSeleksiController extends Controller
// ->skip($start) // ->skip($start)
// ->take($rowperpage) // ->take($rowperpage)
// ->get(); // ->get();
$records = collect(DB::select("select * from vw_daftar_proposal('".$noidentitas."') WHERE ".$statementGlobal.$statement." ORDER BY ".$columnName." ".$columnSortOrder)) $records = collect(DB::select("select * from vw_daftar_proposal('".$statementGlobal.$statement."', '".$noidentitas."') ORDER BY ".$columnName." ".$columnSortOrder))
->skip($start) ->skip($start)
->take($rowperpage); ->take($rowperpage);
......
...@@ -23,15 +23,19 @@ ...@@ -23,15 +23,19 @@
$tempKode = ''; $tempKode = '';
@endphp @endphp
@foreach ($list_proposal as $proposal) @foreach ($list_proposal as $proposal)
@if($tempKode != $proposal['kode']) {{-- @if($tempKode != $proposal['kode']) --}}
<tr> <tr>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $no++ }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $no++ }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['kode'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['kode'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['jenis'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['jenis'] }}</th>
<th style="border: 1px solid #000000;">{{ $proposal['fak'] }}</th> @foreach ($proposal['detil'] as $res => $val)
<th style="border: 1px solid #000000;">{{ $proposal['nama'] }}</th> @if($res == 0)
<th style="border: 1px solid #000000;">{{ $proposal['nim'] }}</th> <th style="border: 1px solid #000000;">{{ $val['fak'] }}</th>
<th style="border: 1px solid #000000;">{{ $proposal['keanggotaan'] }}</th> <th style="border: 1px solid #000000;">{{ $val['nama'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['nim'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['keanggotaan'] }}</th>
@endif
@endforeach
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['email_ketua'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['email_ketua'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['judul'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['judul'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['dospem'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['dospem'] }}</th>
...@@ -40,16 +44,20 @@ ...@@ -40,16 +44,20 @@
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['status'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['status'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['rata'] }}</th> <th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['rata'] }}</th>
</tr> </tr>
@else {{-- @else --}}
@foreach ($proposal['detil'] as $res => $val)
@if($res != 0)
<tr valign="top"> <tr valign="top">
<th style="border: 1px solid #000000;">{{ $proposal['fak'] }}</th> <th style="border: 1px solid #000000;">{{ $val['fak'] }}</th>
<th style="border: 1px solid #000000;">{{ $proposal['nama'] }}</th> <th style="border: 1px solid #000000;">{{ $val['nama'] }}</th>
<th style="border: 1px solid #000000;">{{ $proposal['nim'] }}</th> <th style="border: 1px solid #000000;">{{ $val['nim'] }}</th>
<th style="border: 1px solid #000000;">{{ $proposal['keanggotaan'] }}</th> <th style="border: 1px solid #000000;">{{ $val['keanggotaan'] }}</th>
</tr> </tr>
@endif @endif
@endforeach
{{-- @endif --}}
@php @php
$tempKode = $proposal['kode']; // $tempKode = $proposal['kode'];
@endphp @endphp
@endforeach @endforeach
</tbody> </tbody>
......
@php
header("Content-Type: application/vnd.ms-excel; charset=utf-8");
header("Content-Disposition: attachment; filename=daftar-proposal-seleksi-internal.xls"); //File name extension was wrong
header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
header("Cache-Control: private",false);
@endphp
<table border="1">
<thead>
<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 PKM</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>
<td style="border: 1px solid #000000;"><strong>Ketua/Anggota</strong></td>
<td style="border: 1px solid #000000;"><strong>Email Ketua</strong></td>
<td style="border: 1px solid #000000;"><strong>Judul Proposal</strong></td>
<td style="border: 1px solid #000000;"><strong>Dosen Pembimbing</strong></td>
<td style="border: 1px solid #000000;"><strong>Email Dosen Pembimbing</strong></td>
<td style="border: 1px solid #000000;"><strong>Link Proposal</strong></td>
<td style="border: 1px solid #000000;"><strong>Status {{ $jenis_monev }}</strong></td>
<td style="border: 1px solid #000000;"><strong>Nilai Akhir</strong></td>
</tr>
</thead>
<tbody>
@php
$no = 1;
$tempKode = '';
@endphp
@foreach ($list_proposal as $proposal)
{{-- @if($tempKode != $proposal['kode']) --}}
<tr>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $no++ }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['kode'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['jenis'] }}</th>
@foreach ($proposal['detil'] as $res => $val)
@if($res == 0)
<th style="border: 1px solid #000000;">{{ $val['fak'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['nama'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['nim'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['keanggotaan'] }}</th>
@endif
@endforeach
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['email_ketua'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['judul'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['dospem'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['email_dospem'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;"><a href="{{ $proposal['link'] }}" target="_blank">Link</a></th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['status'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['rata'] }}</th>
</tr>
{{-- @else --}}
@foreach ($proposal['detil'] as $res => $val)
@if($res != 0)
<tr valign="top">
<th style="border: 1px solid #000000;">{{ $val['fak'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['nama'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['nim'] }}</th>
<th style="border: 1px solid #000000;">{{ $val['keanggotaan'] }}</th>
</tr>
@endif
@endforeach
{{-- @endif --}}
@php
// $tempKode = $proposal['kode'];
@endphp
@endforeach
</tbody>
</table>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
var status = $("#reqStatus").val(); var status = $("#reqStatus").val();
var tahun = $("#reqTahun").val(); var tahun = $("#reqTahun").val();
window.open('{{url("/operator/cetak-daftar-proposal/")}}?jenis='+jenis+'&tahun='+tahun+'&status='+status+'&_token='+_token, '_blank'); window.open('{{url("/operator/cetak-daftar-proposal-new/")}}?jenis='+jenis+'&tahun='+tahun+'&status='+status+'&_token='+_token, '_blank');
}; };
</script> </script>
......
...@@ -179,6 +179,7 @@ Route::group(['middleware' => ['auth:sanctum', 'verified']], function () { ...@@ -179,6 +179,7 @@ Route::group(['middleware' => ['auth:sanctum', 'verified']], function () {
Route::get('/seleksi-internal-reviewer-approval/{id}/{status}', [DaftarProposalController::class, 'approval'])->name('seleksi-internal.approval'); Route::get('/seleksi-internal-reviewer-approval/{id}/{status}', [DaftarProposalController::class, 'approval'])->name('seleksi-internal.approval');
Route::get('getDaftarProposal', [DaftarProposalController::class, 'getData'])->name('getDaftarProposal'); Route::get('getDaftarProposal', [DaftarProposalController::class, 'getData'])->name('getDaftarProposal');
Route::get('cetak-daftar-proposal', [DaftarProposalController::class, 'cetak_daftar_proposal'])->name('cetak-daftar-proposal'); Route::get('cetak-daftar-proposal', [DaftarProposalController::class, 'cetak_daftar_proposal'])->name('cetak-daftar-proposal');
Route::get('cetak-daftar-proposal-new', [DaftarProposalController::class, 'cetak_daftar_proposal_new'])->name('cetak-daftar-proposal-new');
// SELEKSI BELMAWA // SELEKSI BELMAWA
Route::get('seleksi-belmawa', [DaftarProposalController::class, 'index_belmawa'])->name('seleksi-belmawa'); Route::get('seleksi-belmawa', [DaftarProposalController::class, 'index_belmawa'])->name('seleksi-belmawa');
......
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