Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
simpmw
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
Alfiro Pratama
simpmw
Commits
cd38bd41
Commit
cd38bd41
authored
3 weeks ago
by
Alfiro Pratama
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix query sql kelompok dan proposal
parent
57cc460c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
app/Http/Controllers/Dosen/KelompokController.php
+7
-3
app/Http/Controllers/Dosen/ProposalController.php
+14
-3
No files found.
app/Http/Controllers/Dosen/KelompokController.php
View file @
cd38bd41
...
@@ -33,10 +33,14 @@ class KelompokController extends Controller
...
@@ -33,10 +33,14 @@ class KelompokController extends Controller
$kelompok
=
Kelompok
::
with
([
'rAnggota'
])
$kelompok
=
Kelompok
::
with
([
'rAnggota'
])
// ->where('nidn_dosen', $bio->noidentitas)
// ->where('nidn_dosen', $bio->noidentitas)
->
when
(
$bio
->
noidentitas
!==
null
,
function
(
$query
)
use
(
$bio
)
{
// ->when($bio->noidentitas !== null, function ($query) use ($bio) {
return
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
);
// return $query->where('nidn_dosen', $bio->noidentitas)
// ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
// })
->
where
(
function
(
$query
)
use
(
$bio
)
{
$query
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
)
->
orWhereRaw
(
'LOWER(nama_dosen) = ?'
,
[
strtolower
(
$bio
->
name
)]);
})
})
->
orWhereRaw
(
'LOWER(nama_dosen) = ?'
,
[
strtolower
(
$bio
->
name
)])
->
where
(
'kirim'
,
'1'
)
->
where
(
'kirim'
,
'1'
)
->
whereYear
(
'created_at'
,
$year
)
->
whereYear
(
'created_at'
,
$year
)
->
orderBy
(
'kode'
)
->
orderBy
(
'kode'
)
...
...
This diff is collapsed.
Click to expand it.
app/Http/Controllers/Dosen/ProposalController.php
View file @
cd38bd41
...
@@ -33,10 +33,21 @@ class ProposalController extends Controller
...
@@ -33,10 +33,21 @@ 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', 'rDaftarPro'])
// ->whereHas('rKelompok', function ($query) use($bio){
// $query->where('nidn_dosen', $bio->noidentitas)
// ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
// })
// ->whereYear('created_at', $year)
// ->orderBy('kelompok_id')
// ->get();
$proposal
=
Proposal
::
with
([
'rKelompok'
,
'rJenis'
,
'rDaftarPro'
])
$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
(
function
(
$q
)
use
(
$bio
)
{
->
orWhereRaw
(
'LOWER(nama_dosen) = ?'
,
[
strtolower
(
$bio
->
name
)]);
$q
->
where
(
'nidn_dosen'
,
$bio
->
noidentitas
)
->
orWhereRaw
(
'LOWER(nama_dosen) = ?'
,
[
strtolower
(
$bio
->
name
)]);
});
})
})
->
whereYear
(
'created_at'
,
$year
)
->
whereYear
(
'created_at'
,
$year
)
->
orderBy
(
'kelompok_id'
)
->
orderBy
(
'kelompok_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