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
48137462
Commit
48137462
authored
Feb 24, 2023
by
Farendi Giotivano R.P
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seleksi internal
parent
2bb855e5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
app/Http/Controllers/Dosen/ProposalController.php
+1
-1
app/Http/Controllers/Dosen/SeleksiController.php
+1
-1
app/Models/Proposal.php
+4
-0
resources/views/backend/dosen/seleksi/index_internal.blade.php
+3
-1
No files found.
app/Http/Controllers/Dosen/ProposalController.php
View file @
48137462
...
@@ -32,7 +32,7 @@ class ProposalController extends Controller
...
@@ -32,7 +32,7 @@ class ProposalController extends Controller
$periode
=
Periode
::
query
()
->
get
();
$periode
=
Periode
::
query
()
->
get
();
$year
=
!
is_null
(
$request
->
year
)
?
$request
->
year
:
now
()
->
year
;
$year
=
!
is_null
(
$request
->
year
)
?
$request
->
year
:
now
()
->
year
;
$proposal
=
Proposal
::
with
([
'rKelompok'
,
'rJenis'
])
$proposal
=
Proposal
::
with
([
'rKelompok'
,
'rJenis'
,
'rDaftarPro'
])
->
whereHas
(
'rKelompok'
,
function
(
$query
)
use
(
$bio
){
->
whereHas
(
'rKelompok'
,
function
(
$query
)
use
(
$bio
){
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
);
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
);
})
})
...
...
app/Http/Controllers/Dosen/SeleksiController.php
View file @
48137462
...
@@ -28,7 +28,7 @@ class SeleksiController extends Controller
...
@@ -28,7 +28,7 @@ class SeleksiController extends Controller
$periode
=
Periode
::
query
()
->
get
();
$periode
=
Periode
::
query
()
->
get
();
$year
=
!
is_null
(
$request
->
year
)
?
$request
->
year
:
now
()
->
year
;
$year
=
!
is_null
(
$request
->
year
)
?
$request
->
year
:
now
()
->
year
;
$proposal
=
Proposal
::
with
([
'rKelompok'
,
'rJenis'
])
$proposal
=
Proposal
::
with
([
'rKelompok'
,
'rJenis'
,
'rDaftarPro'
])
->
whereHas
(
'rKelompok'
,
function
(
$query
)
use
(
$bio
){
->
whereHas
(
'rKelompok'
,
function
(
$query
)
use
(
$bio
){
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
);
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
);
})
})
...
...
app/Models/Proposal.php
View file @
48137462
...
@@ -93,5 +93,9 @@ class Proposal extends Model
...
@@ -93,5 +93,9 @@ class Proposal extends Model
return
$this
->
hasOne
(
VDaftarMonev
::
class
,
'proposal_id'
,
'proposal_id'
)
->
with
([
'rReviewerBio1'
,
'rReviewerBio2'
]);
return
$this
->
hasOne
(
VDaftarMonev
::
class
,
'proposal_id'
,
'proposal_id'
)
->
with
([
'rReviewerBio1'
,
'rReviewerBio2'
]);
}
}
public
function
rDaftarPro
()
{
return
$this
->
hasOne
(
DaftarProposal
::
class
,
'proposal_id'
,
'proposal_id'
);
}
}
}
resources/views/backend/dosen/seleksi/index_internal.blade.php
View file @
48137462
...
@@ -76,7 +76,9 @@
...
@@ -76,7 +76,9 @@
<td>{{
$item->rJenis
->nama }}</td>
<td>{{
$item->rJenis
->nama }}</td>
<td>{{
$item->judul
}}</td>
<td>{{
$item->judul
}}</td>
<td>
<td>
@if(is_null(
$item->status
))
@if(is_null(
$item->rDaftarPro
->status_final))
<span class="
badge
bg
-
info
">Menunggu Reviewer</span>
@elseif(
$item->rDaftarPro
->status_final == 1)
<span class="
badge
bg
-
danger
">Lolos Seleksi Internal</span>
<span class="
badge
bg
-
danger
">Lolos Seleksi Internal</span>
@else
@else
<span class="
badge
bg
-
success
">Tidak Lolos Seleksi Internal</span>
<span class="
badge
bg
-
success
">Tidak Lolos Seleksi Internal</span>
...
...
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