perbaikan activity pemohonan ( seacrh filter status multiple, Penilai/Surveyor tidak tampil dan status aktivitas pada permohonan akan berjalan dari bawah ke atas)
This commit is contained in:
@@ -28,8 +28,8 @@
|
|||||||
$row->branch->name,
|
$row->branch->name,
|
||||||
$row->tujuanPenilaian->name,
|
$row->tujuanPenilaian->name,
|
||||||
$row->debiture->name,
|
$row->debiture->name,
|
||||||
$row->fasilitasKredit->name,
|
$row->jenisFasilitasKredit->name,
|
||||||
$row->plafond->name,
|
$row->nilaiPlafond->name,
|
||||||
$row->status,
|
$row->status,
|
||||||
$row->authorized_at,
|
$row->authorized_at,
|
||||||
$row->authorized_status,
|
$row->authorized_status,
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ use Illuminate\Http\RedirectResponse;
|
|||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Modules\Lpj\Models\Permohonan;
|
use Modules\Lpj\Models\Permohonan;
|
||||||
use Modules\Lpj\Models\StatusPermohonan;
|
use Modules\Lpj\Models\StatusPermohonan;
|
||||||
|
use Modules\Lpj\Exports\PermohonanExport;
|
||||||
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
class ActivityController extends Controller
|
class ActivityController extends Controller
|
||||||
{
|
{
|
||||||
public $user;
|
public $user;
|
||||||
@@ -25,6 +26,11 @@ class ActivityController extends Controller
|
|||||||
* Show the form for creating a new resource.
|
* 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.
|
* Store a newly created resource in storage.
|
||||||
*/
|
*/
|
||||||
@@ -39,7 +45,7 @@ class ActivityController extends Controller
|
|||||||
public function show($id)
|
public function show($id)
|
||||||
{
|
{
|
||||||
|
|
||||||
$status_permohonan = StatusPermohonan::orderBy('id')->get();
|
$status_permohonan = StatusPermohonan::orderBy('id')->get()->reverse();
|
||||||
|
|
||||||
$permohonan = Permohonan::with(
|
$permohonan = Permohonan::with(
|
||||||
[
|
[
|
||||||
@@ -67,9 +73,9 @@ class ActivityController extends Controller
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the specified resource in storage.
|
* 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')) {
|
if (is_null($this->user) || !$this->user->can('debitur.view')) {
|
||||||
// abort(403, 'Sorry! You are not allowed to view users.');
|
// 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'))) {
|
if ($request->has('search') && !empty($request->get('search'))) {
|
||||||
$search = $request->get('search');
|
$search = $request->get('search');
|
||||||
$query->where(function ($q) use ($search) {
|
$query->where(function ($q) use ($search) {
|
||||||
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
|
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%')
|
||||||
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
|
->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%')
|
||||||
$q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
|
->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%')
|
||||||
$q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
|
->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%')
|
||||||
$q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
|
->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%')
|
||||||
$q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
|
->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
|
||||||
$q->orWhere('status', 'LIKE', '%' . $search . '%');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply status filter if provided
|
// Split search term by comma to allow multiple statuses
|
||||||
if ($request->has('status') && !empty($request->get('status'))) {
|
$statusKeywords = explode(',', $search);
|
||||||
$status = $request->get('status');
|
foreach ($statusKeywords as $keyword) {
|
||||||
$query->where('status', '=', $status);
|
$q->orWhere('status', 'LIKE', '%' . trim($keyword) . '%');
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default sorting if no sort provided
|
// Default sorting if no sort provided
|
||||||
@@ -103,32 +108,29 @@ class ActivityController extends Controller
|
|||||||
$column = $request->get('sortField');
|
$column = $request->get('sortField');
|
||||||
$query->orderBy($column, $order);
|
$query->orderBy($column, $order);
|
||||||
} else {
|
} 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();
|
$totalRecords = $query->count();
|
||||||
|
|
||||||
// Apply pagination if provided
|
// Pagination
|
||||||
if ($request->has('page') && $request->has('size')) {
|
if ($request->has('page') && $request->has('size')) {
|
||||||
$page = (int) $request->get('page', 1); // Default page is 1
|
$page = (int) $request->get('page', 1);
|
||||||
$size = (int) $request->get('size', 10); // Default size is 10
|
$size = (int) $request->get('size', 10);
|
||||||
$offset = ($page - 1) * $size; // Calculate the offset
|
$offset = ($page - 1) * $size;
|
||||||
|
|
||||||
// Limit results based on pagination
|
|
||||||
$query->skip($offset)->take($size);
|
$query->skip($offset)->take($size);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the filtered count of records (after search & filters applied)
|
// Get filtered count
|
||||||
$filteredRecords = $query->count();
|
$filteredRecords = $query->count();
|
||||||
|
|
||||||
// Get the data for the current page
|
// Get data
|
||||||
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
|
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
|
||||||
|
|
||||||
// Calculate the total number of pages
|
// Calculate total pages
|
||||||
$pageCount = ceil($totalRecords / $request->get('size', 10));
|
$pageCount = ceil($totalRecords / $request->get('size', 10));
|
||||||
|
|
||||||
// Return the response data as a JSON object
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'draw' => $request->get('draw'),
|
'draw' => $request->get('draw'),
|
||||||
'recordsTotal' => $totalRecords,
|
'recordsTotal' => $totalRecords,
|
||||||
@@ -141,6 +143,7 @@ class ActivityController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Download the specified resource from storage.
|
* Download the specified resource from storage.
|
||||||
*/
|
*/
|
||||||
@@ -149,4 +152,10 @@ class ActivityController extends Controller
|
|||||||
$document = Permohonan::find($id);
|
$document = Permohonan::find($id);
|
||||||
return response()->download(storage_path('app/public/' . $document->dokumen));
|
return response()->download(storage_path('app/public/' . $document->dokumen));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function export()
|
||||||
|
{
|
||||||
|
return Excel::download(new PermohonanExport, 'activity.xlsx');
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,45 +10,50 @@ use Modules\Lpj\Models\Teams;
|
|||||||
use Modules\Lpj\Models\Permohonan;
|
use Modules\Lpj\Models\Permohonan;
|
||||||
use Modules\Usermanagement\Models\User;
|
use Modules\Usermanagement\Models\User;
|
||||||
|
|
||||||
|
|
||||||
class Penilaian extends Model
|
class Penilaian extends Model
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes that are mass assignable.
|
* The attributes that are mass assignable.
|
||||||
*/
|
*/
|
||||||
protected $table = 'penilaian';
|
protected $table = 'penilaian';
|
||||||
protected $fillable = [
|
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',
|
'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
|
||||||
'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
|
'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');
|
return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function teams(){
|
public function teams()
|
||||||
|
{
|
||||||
return $this->belongsTo(Teams::class, 'teams_id', 'id');
|
return $this->belongsTo(Teams::class, 'teams_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function users(){
|
public function users()
|
||||||
|
{
|
||||||
return $this->belongsTo(User::class, 'user_id', 'id');
|
return $this->belongsTo(User::class, 'user_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userPenilai(){
|
public function userPenilai()
|
||||||
|
{
|
||||||
return $this->belongsTo(User::class, 'penilaian_id', 'id');
|
return $this->belongsTo(User::class, 'penilaian_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userSurveyor(){
|
public function userSurveyor()
|
||||||
|
{
|
||||||
return $this->belongsTo(User::class, 'surveyor_id', 'id');
|
return $this->belongsTo(User::class, 'surveyor_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function userPenilaiSurveyor(){
|
public function userPenilaiSurveyor()
|
||||||
|
{
|
||||||
return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
|
return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function permohonan(){
|
public function permohonan()
|
||||||
|
{
|
||||||
return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
|
return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
11
module.json
11
module.json
@@ -114,6 +114,17 @@
|
|||||||
"Administrator"
|
"Administrator"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"title": "Activity Progress",
|
||||||
|
"path": "activity",
|
||||||
|
"icon": "ki-filled ki-questionnaire-tablet text-lg",
|
||||||
|
"classes": "",
|
||||||
|
"attributes": [],
|
||||||
|
"permission": "",
|
||||||
|
"roles": [
|
||||||
|
"Administrator"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"title": "Surveyor",
|
"title": "Surveyor",
|
||||||
"path": "surveyor",
|
"path": "surveyor",
|
||||||
|
|||||||
@@ -13,108 +13,115 @@
|
|||||||
</style>
|
</style>
|
||||||
@endpush
|
@endpush
|
||||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header" id="advanced_settings_appearance">
|
<div class="card-header" id="advanced_settings_appearance">
|
||||||
<h3 class="card-title">
|
<h3 class="card-title">
|
||||||
Activity Permohonan
|
Activity Permohonan
|
||||||
</h3>
|
</h3>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<a href="{{ route('activity.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
|
<a href="{{ route('activity.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
|
||||||
Back</a>
|
Back</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-body lg:py-7.5 grid grid-cols-3">
|
||||||
|
<div class="mb-5">
|
||||||
|
<h3 class="text-md font-medium text-gray-900">
|
||||||
|
Nomor Register Permohonan:
|
||||||
|
</h3>
|
||||||
|
<span class="text-2sm text-gray-700">
|
||||||
|
{{ $permohonan->nomor_registrasi }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-5">
|
||||||
|
<h3 class="text-md font-medium text-gray-900">
|
||||||
|
Pemohon:
|
||||||
|
</h3>
|
||||||
|
<span class="text-2sm text-gray-700">
|
||||||
|
{{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-5">
|
||||||
|
<h3 class="text-md font-medium text-gray-900">
|
||||||
|
Tujuan Permohonan:
|
||||||
|
</h3>
|
||||||
|
<span class="text-2sm text-gray-700">
|
||||||
|
{{ $permohonan->tujuanPenilaian->name }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body lg:py-7.5 grid grid-cols-3">
|
|
||||||
<div class="mb-5">
|
<div class="card grow" id="activity_2024">
|
||||||
|
<div class="card-header">
|
||||||
<h3 class="text-md font-medium text-gray-900">
|
<h3 class="text-md font-medium text-gray-900">
|
||||||
Nomor Register Permohonan:
|
Status Activity
|
||||||
</h3>
|
</h3>
|
||||||
<span class="text-2sm text-gray-700">
|
|
||||||
{{ $permohonan->nomor_registrasi }}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
<div class="mb-5">
|
<div class="flex flex-col">
|
||||||
<h3 class="text-md font-medium text-gray-900">
|
@foreach ($status_permohonan as $index => $status)
|
||||||
Pemohon:
|
{{-- Cek apakah status adalah "Revisi" dan status permohonan tidak sama, maka tidak ditampilkan --}}
|
||||||
</h3>
|
@if (strtolower($status->name) == 'revisi' && strtolower($status->name) != strtolower($permohonan->status))
|
||||||
<span class="text-2sm text-gray-700">
|
@continue
|
||||||
{{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-5">
|
|
||||||
<h3 class="text-md font-medium text-gray-900">
|
|
||||||
Tujan Permohonan:
|
|
||||||
</h3>
|
|
||||||
<span class="text-2sm text-gray-700">
|
|
||||||
{{ $permohonan->tujuanPenilaian->name }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="card grow" id="activity_2024">
|
|
||||||
<div class="card-header">
|
|
||||||
<h3 class="text-md font-medium text-gray-900">
|
|
||||||
Status Activity
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="flex flex-col">
|
|
||||||
@foreach ($status_permohonan as $index => $status)
|
|
||||||
{{-- Cek apakah status adalah "Revisi" dan status permohonan tidak sama, maka tidak ditampilkan --}}
|
|
||||||
@if (strtolower($status->name) == 'revisi' && strtolower($status->name) != strtolower($permohonan->status))
|
|
||||||
@continue
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div class="flex items-start relative">
|
|
||||||
@if ($index < count($status_permohonan) - 1)
|
|
||||||
<div
|
|
||||||
class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2
|
|
||||||
{{ strtolower($status->name) == strtolower($permohonan->status) ? 'border-l border-l-primary' : 'border-l border-l-gray-300' }}">
|
|
||||||
</div>
|
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<div
|
<div class="flex items-start relative">
|
||||||
class="flex items-center justify-center shrink-0 rounded-full
|
@if ($index > 0)
|
||||||
{{ strtolower($status->name) == strtolower($permohonan->status) ? ' btn-outline btn-primary' : 'bg-gray-100 border-gray-300 text-gray-600' }}
|
<div
|
||||||
size-9">
|
class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2
|
||||||
@switch(strtolower($status->name))
|
{{ strtolower($status->name) == strtolower($permohonan->status) ? 'border-l border-l-primary' : 'border-l border-l-gray-300' }}">
|
||||||
@case('order')
|
</div>
|
||||||
<i class="ki-filled ki-handcart text-base"></i>
|
@endif
|
||||||
@break
|
|
||||||
|
|
||||||
@case('revisi')
|
<div
|
||||||
<i class="ki-filled ki-notepad-edit text-base"></i>
|
class="flex items-center justify-center shrink-0 rounded-full
|
||||||
@break
|
{{ strtolower($status->name) == strtolower($permohonan->status) ? 'btn-outline btn-primary' : 'bg-gray-100 border-gray-300 text-gray-600' }}
|
||||||
|
size-9">
|
||||||
|
@switch(strtolower($status->name))
|
||||||
|
@case('order')
|
||||||
|
<i class="ki-filled ki-handcart text-base"></i>
|
||||||
|
@break
|
||||||
|
|
||||||
@case('register')
|
@case('revisi')
|
||||||
<i class="ki-filled ki-note-2 text-base"></i>
|
<i class="ki-filled ki-notepad-edit text-base"></i>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case('assign')
|
@case('register')
|
||||||
<i class="ki-filled ki-file-added"></i>
|
<i class="ki-filled ki-note-2 text-base"></i>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@case('survey')
|
@case('assign')
|
||||||
<i class="ki-filled ki-map text-base"></i>
|
<i class="ki-filled ki-file-added"></i>
|
||||||
@break
|
@break
|
||||||
|
|
||||||
@default
|
@case('survey')
|
||||||
<i class="ki-filled ki-people text-base"></i>
|
<i class="ki-filled ki-map text-base"></i>
|
||||||
@endswitch
|
@break
|
||||||
|
@case('proses laporan')
|
||||||
|
<i class="ki-filled ki-paper-plane text-base"></i>
|
||||||
|
@break
|
||||||
|
@case('approved')
|
||||||
|
<i class="ki-filled ki-check text-base"></i>
|
||||||
|
@break
|
||||||
|
@case('delivered')
|
||||||
|
<i class="ki-filled ki-delivery-3 text-base"></i>
|
||||||
|
@break
|
||||||
|
@default
|
||||||
|
<i class="ki-filled ki-information text-base"></i>
|
||||||
|
@endswitch
|
||||||
|
|
||||||
|
</div>
|
||||||
|
@include('lpj::activity.components.status')
|
||||||
</div>
|
</div>
|
||||||
@include('lpj::activity.components.status')
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@endforeach
|
</div>
|
||||||
|
<div class="card-footer justify-center">
|
||||||
|
<!-- Add footer content if necessary -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer justify-center">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
@endsection
|
@endsection
|
||||||
|
|||||||
@@ -43,47 +43,10 @@
|
|||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- Tampilkan informasi assign jika status 'assign' --}}
|
|
||||||
@if (strtolower($status->name) == 'assign' && $isCurrentStatus)
|
@if (strtolower($status->name) == 'assign' && $isCurrentStatus)
|
||||||
<div class="card shadow-none">
|
<div class="card shadow-none">
|
||||||
<div class="card-body grid grid-cols-3 gap-5">
|
<div class="card-body grid grid-cols-3 gap-5">
|
||||||
{{-- Informasi Penilai, Surveyor, dan Penilai Surveyor --}}
|
|
||||||
<div>
|
|
||||||
@isset($permohonan->penilaian)
|
|
||||||
@if ($penilai = $permohonan->penilaian->userPenilai->name ?? null)
|
|
||||||
<div class="mb-3">
|
|
||||||
<p class="text-md font-medium text-gray-900">Penilai:</p>
|
|
||||||
<span class="text-2sm text-gray-700">{{ $penilai }}</span>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@if ($surveyor = $permohonan->penilaian->userSurveyor->name ?? null)
|
|
||||||
<div class="mb-3">
|
|
||||||
<p class="text-md font-medium text-gray-900">Surveyor:</p>
|
|
||||||
<span class="text-2sm text-gray-700">{{ $surveyor }}</span>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@if ($penilaiSurveyor = $permohonan->penilaian->userPenilaiSurveyor->name ?? null)
|
|
||||||
<div class="mb-3">
|
|
||||||
<p class="text-md font-medium text-gray-900">Penilai Surveyor:</p>
|
|
||||||
<span class="text-2sm text-gray-700">{{ $penilaiSurveyor }}</span>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
@endisset
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{-- Teams --}}
|
|
||||||
<div>
|
|
||||||
<h3 class="text-md font-medium text-gray-900">Teams:</h3>
|
|
||||||
<ul>
|
|
||||||
@foreach ($permohonan->penilaian->teams->teamsUsers as $item)
|
|
||||||
<li class="text-xs text-gray-800 leading-[22px]">{{ $item->user->name }}</li>
|
|
||||||
@endforeach
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{-- Catatan --}}
|
|
||||||
<div>
|
<div>
|
||||||
<h3 class="text-md font-medium text-gray-900">Catatan:</h3>
|
<h3 class="text-md font-medium text-gray-900">Catatan:</h3>
|
||||||
<span class="text-2sm text-gray-700">{{ $permohonan->penilaian->keterangan }}</span>
|
<span class="text-2sm text-gray-700">{{ $permohonan->penilaian->keterangan }}</span>
|
||||||
|
|||||||
@@ -4,16 +4,45 @@
|
|||||||
{{ Breadcrumbs::render('activity') }}
|
{{ Breadcrumbs::render('activity') }}
|
||||||
@endsection
|
@endsection
|
||||||
@section('content')
|
@section('content')
|
||||||
|
@push('styles')
|
||||||
|
<style>
|
||||||
|
.dropdown {
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
.dropdowns-content {
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
background-color: white;
|
||||||
|
min-width: 224px;
|
||||||
|
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
.dropdown:hover .dropdowns-content {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.dropdowns-content a {
|
||||||
|
color: black;
|
||||||
|
padding: 12px 16px;
|
||||||
|
text-decoration: none;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.dropdowns-content a:hover {
|
||||||
|
background-color: #f1f1f1;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
@endpush
|
||||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
||||||
<div class="card pb-2.5">
|
<div class="card pb-2.5">
|
||||||
<div class="card-header" id="basic_settings">
|
<div class="card-header" id="basic_settings">
|
||||||
<div class="card-title flex flex-row gap-1.5">
|
<div class="card-title flex flex-row gap-1.5">
|
||||||
Activity
|
Activity
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="card-header py-5 flex-wrap">
|
<div class="card-header py-5 flex-wrap">
|
||||||
<h3 class="card-title">
|
|
||||||
{{-- Daftar {{}} --}}
|
|
||||||
</h3>
|
|
||||||
<div class="flex flex-wrap gap-2 lg:gap-5">
|
<div class="flex flex-wrap gap-2 lg:gap-5">
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
<label class="input input-sm">
|
<label class="input input-sm">
|
||||||
@@ -22,14 +51,42 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex">
|
|
||||||
<select class="select select-sm w-28" name="select" id="status-filter">
|
<div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
|
||||||
<option value="">Pilih Status</option>
|
<button
|
||||||
@foreach ($status_permohonan as $item)
|
class="dropdowns-toggle btn btn-sm btn-light inline-flex justify-between w-full items-center">
|
||||||
<option value="{{ strtolower($item->name) }}">{{ $item->name }}</option>
|
Pilih Status
|
||||||
@endforeach
|
<i class="ki-outline ki-down dropdown-open:hidden">
|
||||||
</select>
|
</i>
|
||||||
|
<i class="ki-outline ki-up hidden dropdown-open:block">
|
||||||
|
</i>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
class="dropdowns-content w-full max-w-56 py-2 absolute mt-2 origin-top-right z-50 bg-white rounded-md shadow-lg ring-1 ring-black ring-opacity-5">
|
||||||
|
<div class="menu menu-default flex flex-col w-full">
|
||||||
|
<!-- Checkbox untuk All Status -->
|
||||||
|
<div class="menu-item">
|
||||||
|
<label class="menu-link flex items-center px-4 py-2 text-sm text-gray-700">
|
||||||
|
<input id="select-all" type="checkbox"
|
||||||
|
class="form-checkbox h-4 w-4 text-blue-600">
|
||||||
|
<span class="ml-2">All Status</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<!-- Dinamis Status dari Backend -->
|
||||||
|
@foreach ($status_permohonan as $item)
|
||||||
|
<div class="menu-item">
|
||||||
|
<label class="menu-link flex items-center px-4 py-2 text-sm text-gray-700">
|
||||||
|
<input type="checkbox"
|
||||||
|
class="form-checkbox status-checkbox h-4 w-4 text-blue-600"
|
||||||
|
value="{{ strtolower($item->name) }}">
|
||||||
|
<span class="ml-2">{{ $item->name }}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex flex-wrap gap-2.5">
|
<div class="flex flex-wrap gap-2.5">
|
||||||
<div class="h-[24px] border border-r-gray-200"></div>
|
<div class="h-[24px] border border-r-gray-200"></div>
|
||||||
<a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
|
<a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
|
||||||
@@ -203,9 +260,44 @@
|
|||||||
dataTable.search(searchValue, true);
|
dataTable.search(searchValue, true);
|
||||||
});
|
});
|
||||||
|
|
||||||
statusFilter.addEventListener('change', function() {
|
|
||||||
const selectedStatus = this.value;
|
const selectAllCheckbox = document.getElementById('select-all');
|
||||||
dataTable.search(selectedStatus);
|
const statusCheckboxes = document.querySelectorAll('.status-checkbox');
|
||||||
|
|
||||||
|
statusCheckboxes.forEach(checkbox => {
|
||||||
|
checkbox.addEventListener('change', applyStatusFilter);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Event listener untuk "Select All"
|
||||||
|
selectAllCheckbox.addEventListener('change', function() {
|
||||||
|
const isChecked = this.checked;
|
||||||
|
statusCheckboxes.forEach(checkbox => {
|
||||||
|
checkbox.checked = isChecked;
|
||||||
|
});
|
||||||
|
applyStatusFilter();
|
||||||
|
});
|
||||||
|
|
||||||
|
function applyStatusFilter() {
|
||||||
|
const selectedStatuses = Array.from(statusCheckboxes)
|
||||||
|
.filter(checkbox => checkbox.checked)
|
||||||
|
.map(checkbox => checkbox.value);
|
||||||
|
|
||||||
|
|
||||||
|
if (selectedStatuses.length === 0) {
|
||||||
|
dataTable.search('');
|
||||||
|
console.log(selectedStatuses);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
dataTable.search(selectedStatuses.join(','), true);
|
||||||
|
console.log(selectedStatuses);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
const allChecked = Array.from(statusCheckboxes).every(cb => cb.checked);
|
||||||
|
selectAllCheckbox.checked = allChecked;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@endpush
|
@endpush
|
||||||
|
|||||||
15
resources/views/activity/senior_officer/index.blade.php
Normal file
15
resources/views/activity/senior_officer/index.blade.php
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
@extends('layouts.main')
|
||||||
|
|
||||||
|
{{-- @section('breadcrumbs')
|
||||||
|
{{ Breadcrumbs::render('activity') }}
|
||||||
|
@endsection --}}
|
||||||
|
@section('content')
|
||||||
|
|
||||||
|
|
||||||
|
<div class="row"></div>
|
||||||
|
<div class="col-md-12">
|
||||||
|
hello
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@endsection
|
||||||
@@ -335,7 +335,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<select id="surveyor_id" name="surveyor_id"
|
<select id="surveyor_id" name="surveyor_id"
|
||||||
class="input select @error('surveyor_id') border-danger bg-danger-light @enderror w-full">
|
class="select input @error('surveyor_id') border-danger bg-danger-light @enderror w-full">
|
||||||
<option value="">Pilih Surveyor</option>
|
<option value="">Pilih Surveyor</option>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -353,6 +353,11 @@ Route::middleware(['auth'])->group(function () {
|
|||||||
|
|
||||||
Route::resource('debitur', DebitureController::class);
|
Route::resource('debitur', DebitureController::class);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route start Penilaian
|
||||||
|
*/
|
||||||
|
|
||||||
Route::name('penilaian.')->prefix('penilaian')->group(function () {
|
Route::name('penilaian.')->prefix('penilaian')->group(function () {
|
||||||
Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
|
Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
|
||||||
Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
|
Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
|
||||||
@@ -367,6 +372,13 @@ Route::middleware(['auth'])->group(function () {
|
|||||||
Route::post('store', [PenilaianController::class, 'store'])->name('store');
|
Route::post('store', [PenilaianController::class, 'store'])->name('store');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route end Penilaian
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route start activity
|
||||||
|
*/
|
||||||
|
|
||||||
Route::name('activity.')->prefix('activity')->group(function () {
|
Route::name('activity.')->prefix('activity')->group(function () {
|
||||||
Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
|
Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
|
||||||
@@ -376,8 +388,13 @@ Route::middleware(['auth'])->group(function () {
|
|||||||
|
|
||||||
Route::get('/{id}/show', [ActivityController::class, 'show'])->name('show');
|
Route::get('/{id}/show', [ActivityController::class, 'show'])->name('show');
|
||||||
Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
|
Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
|
||||||
|
Route::get('senior', [ActivityController::class, 'senior'])->name('senior');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route end activity
|
||||||
|
*/
|
||||||
|
|
||||||
Route::name('permohonan.')->prefix('permohonan')->group(function () {
|
Route::name('permohonan.')->prefix('permohonan')->group(function () {
|
||||||
Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
|
Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
|
||||||
Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
|
Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
|
||||||
@@ -445,7 +462,11 @@ Route::middleware(['auth'])->group(function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
Route::name('surveyor.')->prefix('surveyor')->group(function () {
|
/**
|
||||||
|
* Route start surveyor
|
||||||
|
*/
|
||||||
|
|
||||||
|
Route::name('surveyor.')->prefix('surveyor')->group(function () {
|
||||||
Route::get('restore/{id}', [SurveyorController::class, 'restore'])->name('restore');
|
Route::get('restore/{id}', [SurveyorController::class, 'restore'])->name('restore');
|
||||||
Route::get('datatables', [SurveyorController::class, 'dataForDatatables'])->name('datatables');
|
Route::get('datatables', [SurveyorController::class, 'dataForDatatables'])->name('datatables');
|
||||||
Route::get('export', [SurveyorController::class, 'export'])->name('export');
|
Route::get('export', [SurveyorController::class, 'export'])->name('export');
|
||||||
@@ -455,6 +476,10 @@ Route::middleware(['auth'])->group(function () {
|
|||||||
Route::get('download/{id}', [SurveyorController::class, 'download'])->name('download');
|
Route::get('download/{id}', [SurveyorController::class, 'download'])->name('download');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route end activity
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user