daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-01-20 10:09:29 +07:00
parent e794d3babc 4d5d2625e5
commit 6cd79cce8b
9 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/NocController.php
View File

@@ -146,7 +146,7 @@
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', "%$search%");
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
});
}

2
app/Http/Controllers/PembayaranController.php
View File

@@ -43,7 +43,7 @@
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', "%$search%");
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
});
}

3
app/Http/Controllers/PenilaiController.php
View File

@@ -352,9 +352,10 @@ class PenilaiController extends Controller
// Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$columns = ['nomor_registrasi', 'debiture.name', 'branch.name', 'user.name', 'tujuanPenilaian.name', 'jenisfasilitasKredit.name'];
$columns = ['debiture.name', 'branch.name', 'user.name', 'tujuanPenilaian.name', 'jenisfasilitasKredit.name'];
$query->where(function ($q) use ($search, $columns) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
foreach ($columns as $column) {
$q->orWhereRelation(explode('.', $column)[0], explode('.', $column)[1], 'LIKE', '%' . $search . '%');
}

8
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -95,10 +95,10 @@ class ProsesPenawaranController extends Controller
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('tujuanPenilaianKJPP', 'name', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
$q->where('penawaran.nomor_registrasi', 'LIKE', '%' . $search . '%');
//$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
//$q->orWhereRelation('tujuanPenilaianKJPP', 'name', 'LIKE', '%' . $search . '%');
//$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}

5
app/Http/Controllers/RegistrasiFinalController.php
View File

@@ -57,9 +57,8 @@
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
//$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
//$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}

8
app/Http/Controllers/SLAController.php
View File

@@ -77,12 +77,10 @@ class SLAController extends Controller
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('permohonan', 'tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('permohonan.debiture', 'name', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}

5
app/Http/Controllers/SpkController.php
View File

@@ -46,9 +46,8 @@ use Illuminate\Support\Facades\Auth;
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->whereRelation('permohonan','nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
//$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
//$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}

2
resources/views/component/pdfviewer.blade.php
View File

@@ -1,6 +1,6 @@
<!-- Modal for PDF and Image viewing -->
<div id="previewModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex items-center justify-center hidden w-full z-50">
<div class="bg-white rounded-lg overflow-hidden shadow-xl transform transition-all min-w-3xl w-[1500px] h-[1200px]">
<div class="bg-white rounded-lg overflow-hidden shadow-xl transform transition-all min-w-3xl w-[1280px] h-[768px]">
<div class="p-4 h-full flex flex-col">
<div class="flex justify-between items-center mb-4">
<button id="downloadBtn" class="btn btn-primary btn-sm">

2
resources/views/penilaian/form.blade.php
View File

@@ -270,7 +270,7 @@
</label>
<div class="flex flex-wrap items-baseline w-full">
<textarea class="textarea @error('keterangan') border-danger bg-danger-light @enderror" rows="3"
type="text" name="keterangan">{{ $penilaian->keterangan ?? '' }}</textarea>
type="text" name="keterangan">{{ $permohonan->registrasi_cat ?? "" }} {{ $penilaian->keterangan ?? '' }}</textarea>
</div>
<em id="error-keterangan" class="alert text-danger text-sm"></em>