Commit 0a265f55 by novanbagus

update rata-rata

parent b68174fa
...@@ -60,6 +60,7 @@ class DaftarProposalController extends Controller ...@@ -60,6 +60,7 @@ class DaftarProposalController extends Controller
$records = DaftarProposal::orderBy($columnName,$columnSortOrder) $records = DaftarProposal::orderBy($columnName,$columnSortOrder)
->whereRaw($statementGlobal.$statement) ->whereRaw($statementGlobal.$statement)
->select('daftar_proposal.*') ->select('daftar_proposal.*')
->selectRaw("ROUND((nilai_1 + nilai_2) / 2, 0) as rata")
->skip($start) ->skip($start)
->take($rowperpage) ->take($rowperpage)
->get(); ->get();
...@@ -78,8 +79,9 @@ class DaftarProposalController extends Controller ...@@ -78,8 +79,9 @@ class DaftarProposalController extends Controller
$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_final;
$rata = $record->rata;
$rata = ($nilai_1 + $nilai_2) / 2; // $rata = ($nilai_1 + $nilai_2) / 2;
// $delete = "confirmLolos('".Crypt::encrypt($reviewer_id)."')"; // $delete = "confirmLolos('".Crypt::encrypt($reviewer_id)."')";
......
...@@ -68,6 +68,7 @@ class MonevProposalController extends Controller ...@@ -68,6 +68,7 @@ class MonevProposalController extends Controller
$records = DaftarProposalMonev::orderBy($columnName,$columnSortOrder) $records = DaftarProposalMonev::orderBy($columnName,$columnSortOrder)
->whereRaw($statementGlobal.$statement) ->whereRaw($statementGlobal.$statement)
->select('daftar_proposal_monev.*') ->select('daftar_proposal_monev.*')
->selectRaw("ROUND((nilai_1 + nilai_2) / 2, 0) as rata")
->skip($start) ->skip($start)
->take($rowperpage) ->take($rowperpage)
->get(); ->get();
...@@ -87,8 +88,9 @@ class MonevProposalController extends Controller ...@@ -87,8 +88,9 @@ class MonevProposalController extends Controller
$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_final;
$rata = $record->rata;
$rata = ($nilai_1 + $nilai_2) / 2; // $rata = ($nilai_1 + $nilai_2) / 2;
// $delete = "confirmLolos('".Crypt::encrypt($reviewer_id)."')"; // $delete = "confirmLolos('".Crypt::encrypt($reviewer_id)."')";
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
$(document).ready(function(){ $(document).ready(function(){
$('#example').on('click','.viewdetails',function(){ $('.viewdetails').on('click','.viewdetails',function(){
var kelId = $(this).attr('data-id'); var kelId = $(this).attr('data-id');
......
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