Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
simpkm
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Farendi Giotivano R.P
simpkm
Commits
0a265f55
Commit
0a265f55
authored
2 years ago
by
novanbagus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update rata-rata
parent
b68174fa
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/Http/Controllers/Operator/DaftarProposalController.php
+3
-1
app/Http/Controllers/Operator/MonevProposalController.php
+3
-1
resources/views/backend/operator/kelompok/index.blade.php
+1
-1
No files found.
app/Http/Controllers/Operator/DaftarProposalController.php
View file @
0a265f55
...
...
@@ -60,6 +60,7 @@ class DaftarProposalController extends Controller
$records
=
DaftarProposal
::
orderBy
(
$columnName
,
$columnSortOrder
)
->
whereRaw
(
$statementGlobal
.
$statement
)
->
select
(
'daftar_proposal.*'
)
->
selectRaw
(
"ROUND((nilai_1 + nilai_2) / 2, 0) as rata"
)
->
skip
(
$start
)
->
take
(
$rowperpage
)
->
get
();
...
...
@@ -78,8 +79,9 @@ class DaftarProposalController extends Controller
$reviewer_id_1
=
$record
->
reviewer_id_1
;
$reviewer_id_2
=
$record
->
reviewer_id_2
;
$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)."')";
...
...
This diff is collapsed.
Click to expand it.
app/Http/Controllers/Operator/MonevProposalController.php
View file @
0a265f55
...
...
@@ -68,6 +68,7 @@ class MonevProposalController extends Controller
$records
=
DaftarProposalMonev
::
orderBy
(
$columnName
,
$columnSortOrder
)
->
whereRaw
(
$statementGlobal
.
$statement
)
->
select
(
'daftar_proposal_monev.*'
)
->
selectRaw
(
"ROUND((nilai_1 + nilai_2) / 2, 0) as rata"
)
->
skip
(
$start
)
->
take
(
$rowperpage
)
->
get
();
...
...
@@ -87,8 +88,9 @@ class MonevProposalController extends Controller
$reviewer_id_1
=
$record
->
reviewer_id_1
;
$reviewer_id_2
=
$record
->
reviewer_id_2
;
$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)."')";
...
...
This diff is collapsed.
Click to expand it.
resources/views/backend/operator/kelompok/index.blade.php
View file @
0a265f55
...
...
@@ -115,7 +115,7 @@
$(document).ready(function(){
$('
#example
').on('click','.viewdetails',function(){
$('
.viewdetails
').on('click','.viewdetails',function(){
var kelId = $(this).attr('data-id');
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment