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

prerbaikan export dan penambahan role di team penilai

Browse Source
This commit is contained in:
majid
2024-09-13 17:02:04 +07:00
parent 0ae0374e5e
commit 53ccf7de11
15 changed files with 1107 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Http\Requests\JenisPenilaianRequest;
use Modules\Lpj\Exports\JenisPenilaianExport;
use Maatwebsite\Excel\Facades\Excel;
class JenisPenilaianController extends Controller
{
public $user;
@@ -59,14 +60,13 @@ class JenisPenilaianController extends Controller
public function update(JenisPenilaianRequest $request, $id)
{
$validate = $request->validate();
$validated = $request->validated();
// dump($validate);
if ($validate) {
if ($validated) {
try {
$jenisPenilaian = JenisPenilaian::find($id);
$jenisPenilaian->update($validate);
$jenisPenilaian->update($validated);
return redirect()->route('basicdata.jenis-penilaian.index')->with('success', 'Jenis Penilaian updated successfully');
} catch (Exception $e) {
return redirect()->route('basicdata.jenis-penilaian.edit', $id)->with('error', $e->getMessage());

103
app/Http/Controllers/PenilaianController.php
View File

@@ -6,6 +6,18 @@ use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\TujuanPenilaian;
use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\JenisJaminan;
use Modules\Lpj\Models\NilaiPlafond;
use Modules\Lpj\Models\JenisFasilitasKredit;
class PenilaianController extends Controller
{
@@ -14,15 +26,17 @@ class PenilaianController extends Controller
*/
public function index()
{
return view('lpj::penilaian.index');
$status_permohonan = StatusPermohonan::all();
return view('lpj::penilaian.index', compact('status_permohonan'));
}
/**
* Show the form for creating a new resource.
*/
public function create()
public function create($id)
{
return view('lpj::create');
return view('lpj::penilaian.form');
}
/**
@@ -46,7 +60,22 @@ class PenilaianController extends Controller
*/
public function edit($id)
{
return view('lpj::edit');
$permohonan = Permohonan::with(['user', 'debiture.province','debiture.city','debiture.district','debiture.village','branch', 'tujuanPenilaian'])->findOrFail($id);
$jenisPenilaian = JenisPenilaian::all();
$teamPenilai = Teams::with(['regions', 'teamsUsers'])->get();
$jenisJaminan = JenisJaminan::all();
$nilaiPlafond = NilaiPlafond::all();
$jenisFasilitas = JenisFasilitasKredit::all();
return view('lpj::penilaian.form', compact('permohonan', 'jenisPenilaian', 'teamPenilai', 'jenisJaminan', 'nilaiPlafond', 'jenisFasilitas'));
}
/**
@@ -64,4 +93,70 @@ class PenilaianController extends Controller
{
//
}
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.');
}
// Retrieve data from the database
$query = Permohonan::query();
// Apply search filter if provided
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 . '%');
});
}
// Apply sorting if provided
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
// Get the total count of records
$totalRecords = $query->count();
// Apply pagination if provided
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page');
$size = $request->get('size');
$offset = ($page - 1) * $size; // Calculate the offset
$query->skip($offset)->take($size);
}
// Get the filtered count of records
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = 0 + 1;
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
}
}

342
app/Http/Controllers/PermohonanController.php
View File

@@ -1,182 +1,184 @@
<?php
namespace Modules\Lpj\Http\Controllers;
namespace Modules\Lpj\Http\Controllers;
use App\Http\Controllers\Controller;
use Exception;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Exports\PermohonanExport;
use Modules\Lpj\Http\Requests\PermohonanRequest;
use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\TujuanPenilaian;
use App\Http\Controllers\Controller;
use Exception;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Exports\PermohonanExport;
use Modules\Lpj\Http\Requests\PermohonanRequest;
use Modules\Lpj\Models\Branch;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\TujuanPenilaian;
class PermohonanController extends Controller
class PermohonanController extends Controller
{
public $user;
public function index()
{
public $user;
return view('lpj::permohonan.index');
}
public function index()
{
return view('lpj::permohonan.index');
}
public function store(PermohonanRequest $request)
{
$validate = $request->validated();
public function store(PermohonanRequest $request)
{
$validate = $request->validated();
if ($validate) {
try {
// Save to database qq
Permohonan::create($validate);
return redirect()
->route('permohonan.index')
->with('success', 'Permohonan created successfully');
} catch (Exception $e) {
return redirect()
->route('permohonan.create')
->with('error', 'Failed to create permohonan' . $e->getMessage());
}
} else {
// dump($validate);
if ($validate) {
try {
// Save to database qq
Permohonan::create($validate);
return redirect()
->route('permohonan.index')
->with('success', 'Permohonan created successfully');
} catch (Exception $e) {
return redirect()
->route('permohonan.create')
->with('success', 'error naon iye')
->withInput();
->with('error', 'Failed to create permohonan' . $e->getMessage());
}
}
public function create(){
return view('lpj::permohonan.create');
}
public function createPermohonan($debitur)
{
$branches = Branch::all();
$debitur = Debiture::find($debitur);
$tujuanPenilaian = TujuanPenilaian::all();
$status = StatusPermohonan::all();
return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
}
public function edit($id)
{
$permohonan = Permohonan::find($id);
$branches = Branch::all();
$debitur = Debiture::find($permohonan->debiture_id);
$tujuanPenilaian = TujuanPenilaian::all();
$status = StatusPermohonan::all();
return view(
'lpj::permohonan.form',
compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'),
);
}
public function update(PermohonanRequest $request, $id)
{
$validate = $request->validated();
if ($validate) {
try {
// Update in database
$permohonan = Permohonan::find($id);
$permohonan->update($validate);
return redirect()
->route('permohonan.index')
->with('success', 'Permohonan updated successfully');
} catch (Exception $e) {
return redirect()
->route('permohonan.edit', $id)
->with('error', 'Failed to update permohonan');
}
}
}
public function destroy($id)
{
try {
// Delete from database
$permohonan = Permohonan::find($id);
$permohonan->delete();
echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
} catch (Exception $e) {
echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
}
}
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.');
}
// Retrieve data from the database
$query = Permohonan::query();
// Apply search filter if provided
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 . '%');
});
}
// Apply sorting if provided
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
// Get the total count of records
$totalRecords = $query->count();
// Apply pagination if provided
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page');
$size = $request->get('size');
$offset = ($page - 1) * $size; // Calculate the offset
$query->skip($offset)->take($size);
}
// Get the filtered count of records
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = 0 + 1;
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
}
public function export()
{
return Excel::download(new PermohonanExport, 'permohonan.xlsx');
} else {
return redirect()
->route('permohonan.create')
->with('success', 'error naon iye')
->withInput();
}
}
public function create()
{
return view('lpj::permohonan.create');
}
public function createPermohonan($debitur)
{
$branches = Branch::all();
$debitur = Debiture::find($debitur);
$tujuanPenilaian = TujuanPenilaian::all();
$status = StatusPermohonan::all();
return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
}
public function edit($id)
{
$permohonan = Permohonan::find($id);
$branches = Branch::all();
$debitur = Debiture::find($permohonan->debiture_id);
$tujuanPenilaian = TujuanPenilaian::all();
$status = StatusPermohonan::all();
return view(
'lpj::permohonan.form',
compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'),
);
}
public function update(PermohonanRequest $request, $id)
{
$validate = $request->validated();
if ($validate) {
try {
// Update in database
$permohonan = Permohonan::find($id);
$permohonan->update($validate);
return redirect()
->route('permohonan.index')
->with('success', 'Permohonan updated successfully');
} catch (Exception $e) {
return redirect()
->route('permohonan.edit', $id)
->with('error', 'Failed to update permohonan');
}
}
}
public function destroy($id)
{
try {
// Delete from database
$permohonan = Permohonan::find($id);
$permohonan->delete();
echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
} catch (Exception $e) {
echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
}
}
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.');
}
// Retrieve data from the database
$query = Permohonan::query();
// Apply search filter if provided
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 . '%');
});
}
// Apply sorting if provided
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
// Get the total count of records
$totalRecords = $query->count();
// Apply pagination if provided
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page');
$size = $request->get('size');
$offset = ($page - 1) * $size; // Calculate the offset
$query->skip($offset)->take($size);
}
// Get the filtered count of records
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = 0 + 1;
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
}
public function export()
{
return Excel::download(new PermohonanExport(), 'permohonan.xlsx');
}
}

65
app/Http/Controllers/TeamsController.php
View File

@@ -38,7 +38,9 @@ class TeamsController extends Controller
// cek user apakah sudah ada di tabel teams_users
$userTeam = TeamsUsers::pluck('user_id')->toArray();
$user = User::whereNotIn('id', $userTeam)->get();
$user = User::whereNotIn('id', $userTeam)
->with('roles')
->get();
return view('lpj::teams.form', compact('region', 'user'));
}
@@ -97,8 +99,9 @@ class TeamsController extends Controller
$region = Regions::all();
$usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
$user = User::whereNotIn('id', $usedUsers)->get();
$user = User::whereNotIn('id', $usedUsers)
->with('roles')
->get();
// Ambil user yang sudah ada di tim ini
$selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
@@ -169,20 +172,20 @@ class TeamsController extends Controller
}
}
public function dataForDatatables(Request $request)
{
if (is_null($this->user) || !$this->user->can('debitur.view')) {
if (is_null($this->user) || !$this->user->can('teams.view')) {
//abort(403, 'Sorry! You are not allowed to view users.');
}
// Inisialisasi query
$query = Teams::select('teams.id as id', 'teams.name as team_name', 'regions.name as region_name')
->join('regions', 'teams.regions_id', '=', 'regions.id')
->leftJoin('teams_users', 'teams.id', '=', 'teams_users.teams_id')
->leftJoin('users', 'teams_users.user_id', '=', 'users.id')
->addSelect('users.name as user_name');
->addSelect('users.id as user_id', 'users.name as user_name');
// search filter
// Filter pencarian
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
@@ -192,41 +195,43 @@ class TeamsController extends Controller
});
}
// sorting
// 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();
$size = $request->get('size');
$pageCount = 1;
// Pagination
$size = $request->get('size', 10);
$page = $request->get('page', 1);
$offset = ($page - 1) * $size;
if ($size > 0) {
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page');
$offset = ($page - 1) * $size;
$query->skip($offset)->take($size);
$filteredRecords = $query->count();
$pageCount = ceil($totalRecords / $size);
}
// Ambil data dengan pagination
$data = $query->skip($offset)->take($size)->get();
$filteredRecords = $data->count();
$pageCount = ceil($totalRecords / $size);
$data = $query->get();
} else {
$filteredRecords = $totalRecords;
$data = $query->get();
}
// Ambil ID pengguna dari hasil query
$userIds = $data->pluck('user_id')->unique();
$currentPage = $request->get('page') ?? 1;
// Ambil data pengguna dengan peran mereka
$users = User::whereIn('id', $userIds)
->with('roles')
->get()
->keyBy('id');
$formattedData = $data->groupBy('id')->map(function ($group) {
// Format data
$formattedData = $data->groupBy('id')->map(function ($group) use ($users) {
$team = $group->first();
$team->user_team = $group->map(function ($item) {
$team->user_team = $group->map(function ($item) use ($users) {
$user = $users->get($item->user_id);
return [
'nama' => $item->user_name,
// 'role' => $item->role_name,
'roles' => $user ? $user->roles->pluck('name')->toArray() : [],
];
})->toArray();
return $team;
@@ -237,16 +242,18 @@ class TeamsController extends Controller
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'page' => $page,
'totalCount' => $totalRecords,
'data' => $formattedData
]);
}
public function export()
{
return Excel::download(new TeamPenilaianExport, 'team-penilai.xlsx');
return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx');
}

2
app/Http/Requests/TeamsRequest.php
View File

@@ -14,7 +14,7 @@ class TeamsRequest extends FormRequest
$rules = [
'name' => 'required|string|max:255',
'status' => 'nullable|boolean',
'regions_id' => 'nullable|exists:regions,id',
'regions_id' => 'required|nullable|exists:regions,id',
'user.*' => 'nullable|exists:users,id',
'authorized_at' => 'nullable|datetime',
'authorized_status' => 'nullable|string|max:1',

8
app/Models/Penilaian.php
View File

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Modules\Lpj\Database\Factories\PenilaianFactory;
use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Models\Teams;
// use Modules\Usermanagement\Models\User;
use Modules\Usermanagement\Models\User;
class Penilaian extends Model
{
@@ -30,9 +30,9 @@ class Penilaian extends Model
return $this->belongsTo(Teams::class, 'team_id', 'id');
}
// public function users(){
// return $this->belongsTo(User::class, 'user_id', 'id');
// }
public function users(){
return $this->belongsTo(User::class, 'user_id', 'id');
}
}