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

Merge remote-tracking branch 'origin/feature/senior-officer' into staging

Browse Source 
# Conflicts:
#	module.json
#	routes/web.php
This commit is contained in:
Daeng Deni Mardaeni
2024-10-04 11:05:26 +07:00
parent 5bfefe973d 0b5820375b
commit 6c20c33edc
17 changed files with 1239 additions and 188 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,

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

@@ -7,7 +7,11 @@ use Exception;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Penilaian;
use Modules\Lpj\Models\TeamsUsers;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Exports\PermohonanExport;
use Maatwebsite\Excel\Facades\Excel;
class ActivityController extends Controller
{
@@ -25,6 +29,39 @@ class ActivityController extends Controller
* Show the form for creating a new resource.
*/
public function progres_activity()
{
// Ambil user yang sedang login
$user = auth()->user();
$roles = $user->load('roles');
$regionId = null;
// Cek apakah user memiliki role 'senior officer'
if ($roles->roles->pluck('name')->contains('senior officer')) {
$regionId = TeamsUsers::with('team.regions')
->where('user_id', $user->id)
->first()?->team->regions_id;
}
$teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions'])
->whereHas('team', function ($q) use ($regionId) {
if ($regionId) {
$q->where('regions_id', $regionId);
}
})
->where('user_id', '!=', $user->id)
->get();
return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
}
public function senior()
{
return view('lpj::activity.senior_officer.index');
}
/**
* Store a newly created resource in storage.
*/
@@ -39,7 +76,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 +104,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 +118,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 +139,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 +174,7 @@ class ActivityController extends Controller
}
/**
* Download the specified resource from storage.
*/
@@ -149,4 +183,64 @@ 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');
}
public function dataTablesForActivity(Request $request, $id)
{
// Query Penilaian dengan relasi yang diperlukan
$query = Penilaian::with(['permohonan', 'permohonan.debiture', 'permohonan.tujuanPenilaian'])
->where(function($q) use ($id) {
$q->where('surveyor_id', $id)
->orWhere('penilaian_id', $id)
->orWhere('penilai_surveyor_id', $id);
});
// Filter pencarian
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', "%$search%")
->orWhere('status', 'LIKE', "%$search%");
});
}
// Sorting
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
// Hitung total records
$totalRecords = $query->count();
// Pagination
$size = $request->get('size', 10);
$page = $request->get('page', 1);
$offset = ($page - 1) * $size;
// Ambil data dengan pagination
$data = $query->skip($offset)->take($size)->get();
$filteredRecords = $data->count();
$pageCount = ceil($totalRecords / $size);
// Return data dalam bentuk JSON
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $page,
'totalCount' => $totalRecords,
'data' => $data
]);
}
}

140
app/Http/Controllers/SurveyorController.php Normal file
View File

@@ -0,0 +1,140 @@
<?php
namespace Modules\Lpj\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\Lpj\Models\Permohonan;
class SurveyorController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
public function index()
{
return view('lpj::surveyor.index');
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
return view('lpj::create');
}
/**
* Store a newly created resource in storage.
*/
public function store(Request $request): RedirectResponse
{
//
}
/**
* Show the specified resource.
*/
public function show($id)
{
$permohonan = Permohonan::with(
[
'user',
'debiture.province',
'debiture.city',
'debiture.district',
'debiture.village',
'branch',
'tujuanPenilaian',
'penilaian'
],
)->findOrFail($id);
return view('lpj::surveyor.detail', compact('permohonan'));
}
/**
* Show the form for editing the specified resource.
*/
public function edit($id)
{
return view('lpj::edit');
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, $id): RedirectResponse
{
//
}
public function dataForDatatables(Request $request)
{
if (is_null($this->user) || !$this->user->can('debitur.view')) {
// abort(403, 'Sorry! You are not allowed to view users.');
}
$query = Permohonan::query();
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 . '%');
});
}
$query->whereRaw('LOWER(status) = ?', ['assign']);
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
$totalRecords = $query->count();
$size = $request->get('size', 10);
if ($size == 0) {
$size = 10;
}
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page', 1);
$offset = ($page - 1) * $size;
$query->skip($offset)->take($size);
}
$filteredRecords = $query->count();
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'jenisFasilitasKredit'])->get();
$pageCount = ceil($totalRecords / $size);
$currentPage = max(1, $request->get('page', 1));
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
}
/**
* Remove the specified resource from storage.
*/
public function destroy($id)
{
//
}
}

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');
}

7
app/Models/TeamsUsers.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model;
use Modules\Lpj\Database\Factories\TeamsUsersFactory;
use Modules\Usermanagement\Models\User;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\Penilaian;
class TeamsUsers extends Model
{
@@ -30,4 +31,10 @@ class TeamsUsers extends Model
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function penilaian()
{
return $this->belongsTo(Penilaian::class, 'teams_id', 'id');
}
}