From cd38bd4165e2fc782405ad796f7c6957668ca406 Mon Sep 17 00:00:00 2001
From: alfiropratama <alfiropratama@unesa.ac.id>
Date: Fri, 18 Apr 2025 22:31:01 +0700
Subject: [PATCH] Fix query sql kelompok dan proposal
---
app/Http/Controllers/Dosen/KelompokController.php | 10 +++++++---
app/Http/Controllers/Dosen/ProposalController.php | 17 ++++++++++++++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/app/Http/Controllers/Dosen/KelompokController.php b/app/Http/Controllers/Dosen/KelompokController.php
index e4726b5..a8063a1 100644
--- a/app/Http/Controllers/Dosen/KelompokController.php
+++ b/app/Http/Controllers/Dosen/KelompokController.php
@@ -33,10 +33,14 @@ class KelompokController extends Controller
$kelompok = Kelompok::with(['rAnggota'])
// ->where('nidn_dosen', $bio->noidentitas)
- ->when($bio->noidentitas !== null, function ($query) use ($bio) {
- return $query->where('nidn_dosen', $bio->noidentitas);
+ // ->when($bio->noidentitas !== null, function ($query) use ($bio) {
+ // 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')
->whereYear('created_at', $year)
->orderBy('kode')
diff --git a/app/Http/Controllers/Dosen/ProposalController.php b/app/Http/Controllers/Dosen/ProposalController.php
index c4ac61c..f8b41cc 100644
--- a/app/Http/Controllers/Dosen/ProposalController.php
+++ b/app/Http/Controllers/Dosen/ProposalController.php
@@ -33,10 +33,21 @@ class ProposalController extends Controller
$periode = Periode::query()->get();
$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'])
- ->whereHas('rKelompok', function ($query) use($bio){
- $query->where('nidn_dosen', $bio->noidentitas)
- ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+ ->whereHas('rKelompok', function ($query) use($bio) {
+ $query->where(function ($q) use ($bio) {
+ $q->where('nidn_dosen', $bio->noidentitas)
+ ->orWhereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)]);
+ });
})
->whereYear('created_at', $year)
->orderBy('kelompok_id')
--
libgit2 0.26.0