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

perbaikan activity pemohonan ( seacrh filter status multiple, Penilai/Surveyor tidak tampil dan status aktivitas pada permohonan akan berjalan dari bawah ke atas)

Browse Source
This commit is contained in:
majid
2024-09-27 15:08:13 +07:00
parent d4ab7033c9
commit 5fcce527b4
10 changed files with 307 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Exports/PermohonanExport.php
View File

@@ -28,8 +28,8 @@
$row->branch->name,
$row->tujuanPenilaian->name,
$row->debiture->name,
$row->fasilitasKredit->name,
$row->plafond->name,
$row->jenisFasilitasKredit->name,
$row->nilaiPlafond->name,
$row->status,
$row->authorized_at,
$row->authorized_status,

67
app/Http/Controllers/ActivityController.php
View File

@@ -8,7 +8,8 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Exports\PermohonanExport;
use Maatwebsite\Excel\Facades\Excel;
class ActivityController extends Controller
{
public $user;
@@ -25,6 +26,11 @@ class ActivityController extends Controller
* Show the form for creating a new resource.
*/
public function senior()
{
return view('lpj::activity.senior_officer.index');
}
/**
* Store a newly created resource in storage.
*/
@@ -39,7 +45,7 @@ class ActivityController extends Controller
public function show($id)
{
$status_permohonan = StatusPermohonan::orderBy('id')->get();
$status_permohonan = StatusPermohonan::orderBy('id')->get()->reverse();
$permohonan = Permohonan::with(
[
@@ -67,9 +73,9 @@ class ActivityController extends Controller
/**
* Update the specified resource in storage.
*/
public function dataForDatatables(Request $request)
*/public function dataForDatatables(Request $request)
{
// Check permissions
if (is_null($this->user) || !$this->user->can('debitur.view')) {
// abort(403, 'Sorry! You are not allowed to view users.');
}
@@ -81,20 +87,19 @@ class ActivityController 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('user', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%')
->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%')
->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%')
->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%')
->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%')
->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
// Apply status filter if provided
if ($request->has('status') && !empty($request->get('status'))) {
$status = $request->get('status');
$query->where('status', '=', $status);
// Split search term by comma to allow multiple statuses
$statusKeywords = explode(',', $search);
foreach ($statusKeywords as $keyword) {
$q->orWhere('status', 'LIKE', '%' . trim($keyword) . '%');
}
});
}
// Default sorting if no sort provided
@@ -103,32 +108,29 @@ class ActivityController extends Controller
$column = $request->get('sortField');
$query->orderBy($column, $order);
} else {
$query->orderBy('nomor_registrasi', 'asc'); // Default order by nomor_registrasi
$query->orderBy('nomor_registrasi', 'asc');
}
// Get the total count of records before paginating
// Get total count of records before pagination
$totalRecords = $query->count();
// Apply pagination if provided
// Pagination
if ($request->has('page') && $request->has('size')) {
$page = (int) $request->get('page', 1); // Default page is 1
$size = (int) $request->get('size', 10); // Default size is 10
$offset = ($page - 1) * $size; // Calculate the offset
// Limit results based on pagination
$page = (int) $request->get('page', 1);
$size = (int) $request->get('size', 10);
$offset = ($page - 1) * $size;
$query->skip($offset)->take($size);
}
// Get the filtered count of records (after search & filters applied)
// Get filtered count
$filteredRecords = $query->count();
// Get the data for the current page
// Get data
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
// Calculate the total number of pages
// Calculate total pages
$pageCount = ceil($totalRecords / $request->get('size', 10));
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
@@ -141,6 +143,7 @@ class ActivityController extends Controller
}
/**
* Download the specified resource from storage.
*/
@@ -149,4 +152,10 @@ class ActivityController extends Controller
$document = Permohonan::find($id);
return response()->download(storage_path('app/public/' . $document->dokumen));
}
public function export()
{
return Excel::download(new PermohonanExport, 'activity.xlsx');
}
}

25
app/Models/Penilaian.php
View File

@@ -10,45 +10,50 @@ use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\Permohonan;
use Modules\Usermanagement\Models\User;
class Penilaian extends Model
{
/**
* The attributes that are mass assignable.
*/
protected $table = 'penilaian';
protected $fillable = [
'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
'jenis_penilaian_id', 'teams_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
];
public function jenis_penilaian(){
public function jenis_penilaian()
{
return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
}
public function teams(){
public function teams()
{
return $this->belongsTo(Teams::class, 'teams_id', 'id');
}
public function users(){
public function users()
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function userPenilai(){
public function userPenilai()
{
return $this->belongsTo(User::class, 'penilaian_id', 'id');
}
public function userSurveyor(){
public function userSurveyor()
{
return $this->belongsTo(User::class, 'surveyor_id', 'id');
}
public function userPenilaiSurveyor(){
public function userPenilaiSurveyor()
{
return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
}
public function permohonan(){
public function permohonan()
{
return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
}