Commit 7b0405ef by novanbagus

update proposal export

parent 22cc8cb4
...@@ -42,7 +42,9 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -42,7 +42,9 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
$statement .= " AND PERIODE = '".$this->tahun."'"; $statement .= " AND PERIODE = '".$this->tahun."'";
} }
$data = DaftarProposal::with('rKelompokDetil')->whereRaw($statement)->get(); $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 = []; $result = [];
$no = 0; $no = 0;
...@@ -82,6 +84,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize ...@@ -82,6 +84,7 @@ class DaftarProposalExport implements FromView,ShouldAutoSize
$result[$no]['dospem'] = $dospem; $result[$no]['dospem'] = $dospem;
$result[$no]['link'] = $url; $result[$no]['link'] = $url;
$result[$no]['status'] = $status_final; $result[$no]['status'] = $status_final;
$result[$no]['rata'] = $value->rata;
$no++; $no++;
} }
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<td style="border: 1px solid #000000;"><strong>Dosen Pembimbing</strong></td> <td style="border: 1px solid #000000;"><strong>Dosen Pembimbing</strong></td>
<td style="border: 1px solid #000000;"><strong>Link Proposal</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>Status {{ $jenis_monev }}</strong></td>
<td style="border: 1px solid #000000;"><strong>Nilai Akhir</strong></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
<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>
<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;"><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['status'] }}</th>
<th rowspan="{{ $proposal['rowspan'] }}" style="vertical-align: top; border: 1px solid #000000;">{{ $proposal['rata'] }}</th>
</tr> </tr>
@else @else
<tr valign="top"> <tr valign="top">
......
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