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

Merge remote-tracking branch 'origin/tender' into staging

Browse Source 
# Conflicts:
#	app/Exports/KJPPExport.php
#	app/Http/Controllers/KJPPController.php
#	app/Http/Requests/KJPPRequest.php
#	module.json
#	resources/views/kjpp/create.blade.php
#	resources/views/kjpp/show.blade.php
#	routes/web.php
This commit is contained in:
Daeng Deni Mardaeni
2024-10-02 12:04:41 +07:00
parent 60f0098899 1c92ce9dea
commit 241b916bcd
35 changed files with 2889 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
app/Http/Controllers/JenisLaporanController.php Normal file
View File

@@ -0,0 +1,174 @@
<?php
namespace Modules\Lpj\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\JenisLaporan;
use Modules\Lpj\Exports\JenisLaporanExport;
use Modules\Lpj\Http\Requests\JenisLaporanRequest;
use Throwable;
class JenisLaporanController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
public function index()
{
return view('lpj::jenis_laporan.index');
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
return view('lpj::jenis_laporan.create');
}
/**
* Store a newly created resource in storage.
*/
public function store(JenisLaporanRequest $request)
{
$validate = $request->validated();
if ($validate) {
try {
JenisLaporan::create($validate);
return redirect()
->route('basicdata.jenis_laporan.index')
->with('success', 'Jenis Laporan created successfully');
} catch (Throwable $e) {
return redirect()
->route('basicdata.jenis_laporan.create')
->with('success', 'Failed to create Jenis Laporan: ' . $e);
}
}
}
/**
* Show the specified resource.
*/
public function show($id)
{
// return view('lpj::show');
}
/**
* Show the form for editing the specified resource.
*/
public function edit($id)
{
$jenisLaporan = JenisLaporan::find($id);
return view('lpj::jenis_laporan.create', compact('jenisLaporan'));
}
/**
* Update the specified resource in storage.
*/
public function update(JenisLaporanRequest $request, $id)
{
$validate = $request->validated();
if ($validate) {
try {
$jenisLaporan = JenisLaporan::find($id);
$jenisLaporan->update($validate);
return redirect()
->route('basicdata.jenis_laporan.index')
->with('success', 'Jenis Laporan updated successfully');
} catch (Throwable $e) {
return redirect()
->route('basicdata.jenis_laporan.edit', $id)
->with('success', 'Failed to update Jenis Laporan: ' . $e);
}
}
}
/**
* Remove the specified resource from storage.
*/
public function destroy($id)
{
try {
// Delete from database
$jenisLaporan = JenisLaporan::find($id);
$jenisLaporan->delete();
echo json_encode(['success' => true, 'message' => 'Jenis Laporan deleted successfully']);
} catch (Throwable $e) {
echo json_encode(['success' => false, 'message' => 'Failed to delete jenis Laporan']);
}
}
public function dataForDatatables(Request $request)
{
if (is_null($this->user) || !$this->user->can('jenis_jaminan.view')) {
//abort(403, 'Sorry! You are not allowed to view users.');
}
// Retrieve data from the database
$query = JenisLaporan::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('code', 'LIKE', "%$search%");
$q->orWhere('name', '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->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 JenisLaporanExport, 'jenis_laporan.xlsx');
}
}

18
app/Http/Controllers/KJPPController.php
View File

@@ -40,7 +40,15 @@ class KJPPController extends Controller
$jenis_aset = JenisJaminan::all();
$provinces = Province::all();
return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces'));
// Generate KJPP Number
$lastKjpp = KJPP::orderBy('code', 'desc')->first();
$nextNumber = $lastKjpp ? intval(substr($lastKjpp->code, 1, 6)) + 1 : 1;
$kjppNumber = 'K' . str_pad($nextNumber, 6, '0', STR_PAD_LEFT);
// Combine KJPP number with branch code
$fullKjppNumber = $kjppNumber;
return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
}
/**
@@ -62,6 +70,9 @@ class KJPPController extends Controller
Storage::copy('public/test/default.pdf', 'public/uploads_pdf/' . $filename);
}
$validated['ijin_usaha_id'] = json_encode($request->input('ijin_usaha_id'));
$validated['jenis_aset_id'] = json_encode($request->input('jenis_aset_id'));
// Tambahkan nama file ke data yang divalidasi
$validated['attachment'] = $filename;
@@ -127,7 +138,10 @@ class KJPPController extends Controller
if ($file !== null) {
// Jika ada file dari database maka hapus file yang lama ke file yang baru
$kjpp = KJPP::find($id);
// Storage::delete('public/uploads_pdf/' . $kjpp->attachment);
// Jika filenya ada default.pdf jangan dihapus
if ($kjpp->attachment !== 'default.pdf') {
Storage::delete('public/uploads_pdf/' . $kjpp->attachment);
}
// Simpan file yang diunggah
$file->storeAs('public/uploads_pdf', $filename);
$validated['attachment'] = $filename;

127
app/Http/Controllers/TenderController.php
View File

@@ -2,14 +2,24 @@
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\Penawaran;
use App\Http\Controllers\Controller;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Exports\PenawaranTenderExport;
use Modules\Lpj\Http\Requests\TenderPenawaranRequest;
use Modules\Lpj\Models\JenisLaporan;
use Modules\Lpj\Models\KJPP;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\TujuanPenilaianKJPP;
class TenderController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
@@ -21,33 +31,41 @@ class TenderController extends Controller
/**
* Show the form for creating a new resource.
*/
public function penawaran_create()
public function penawaran_create($id)
{
return view('lpj::penawaran/create');
$status = StatusPermohonan::all();
$tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
$jenis_laporan = JenisLaporan::all();
$kjpp = KJPP::all();
$permohonan = Permohonan::find($id);
$permohonanId = $permohonan->id;
$permohonanNomorRegistrasi = $permohonan->nomor_registrasi;
return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi'));
}
/**
* Store a newly created resource in storage.
*/
public function penawaran_store(Request $request): RedirectResponse
public function penawaran_store(TenderPenawaranRequest $request, $id)
{
// $validated = $request->validate([
// 'nama_kjpp_sebelumnya' => 'required|string',
// 'biaya_kjpp_sebelumnya' => 'required|numeric',
// 'tgl_penilaian_sebelumnya' => 'required|date',
// 'nama_kjpp_1' => 'required|exists:kjpps,id',
// 'nama_kjpp_2' => 'required|exists:kjpps,id',
// 'nama_kjpp_3' => 'required|exists:kjpps,id',
// 'data_jaminan_legalitas' => 'required|string',
// 'tujuan_penilaian' => 'required|in:Penjaminan Hutang,Lelang,Revaluasi Aset',
// 'jenis_laporan' => 'required|in:Short report,Full report',
// 'batas_waktu' => 'required|date',
// 'catatan' => 'nullable|string'
// ]);
$validated = $request->validated();
// Penawaran::create($validated);
if ($validated) {
$validated['nomor_registrasi'] = $request->nomor_registrasi;
// return redirect()->back()->with('success', 'Data berhasil disimpan!');
$validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya'));
PenawaranTender::create($validated);
return redirect()
->route('tender.penawaran.index')
->with('success', 'Data Penawaran created successfully');
} else {
return redirect()
->route('tender.penawaran.createPenawaran', $id)
->with('error', 'Validation failed');
}
}
/**
@@ -69,7 +87,7 @@ class TenderController extends Controller
/**
* Update the specified resource in storage.
*/
public function update(Request $request, $id): RedirectResponse
public function update(Request $request, $id)
{
//
}
@@ -82,6 +100,73 @@ class TenderController extends Controller
//
}
public function datatablesPenawaran(Request $request)
{
if (is_null($this->user) || !$this->user->can('penawaran.view')) {
//abort(403, 'Sorry! You are not allowed to view users.');
}
// Retrieve data from the database
$query = PenawaranTender::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('code', 'LIKE', "%$search%");
$q->orWhere('nama_kjpp_sebelumnya', 'LIKE', "%$search%");
$q->orWhere('tanggal_penilaian_sebelumnya', '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->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 exportPenawaran()
{
return Excel::download(new PenawaranTenderExport, 'kjpp.xlsx');
}
public function proses_penawaran_index()
{
return view('lpj::proses_penawaran/index');

174
app/Http/Controllers/TujuanPenilaianKJPPController.php Normal file
View File

@@ -0,0 +1,174 @@
<?php
namespace Modules\Lpj\Http\Controllers;
use Throwable;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\TujuanPenilaianKJPP;
use Modules\Lpj\Exports\TujuanPenilaianKJPPExport;
use Modules\Lpj\Http\Requests\JenisPenilaianKJPPRequest;
class TujuanPenilaianKJPPController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
public function index()
{
return view('lpj::tujuan_penilaian_kjpp.index');
}
/**
* Show the form for creating a new resource.
*/
public function create()
{
return view('lpj::tujuan_penilaian_kjpp.create');
}
/**
* Store a newly created resource in storage.
*/
public function store(JenisPenilaianKJPPRequest $request)
{
$validate = $request->validated();
if ($validate) {
try {
TujuanPenilaianKJPP::create($validate);
return redirect()
->route('basicdata.tujuan_penilaian_kjpp.index')
->with('success', 'Tujuan Penilaian KJPP created successfully');
} catch (Throwable $e) {
return redirect()
->route('basicdata.tujuan_penilaian_kjpp.create')
->with('success', 'Failed to create Tujuan Penilaian KJPP: ' . $e);
}
}
}
/**
* Show the specified resource.
*/
public function show($id)
{
return view('lpj::show');
}
/**
* Show the form for editing the specified resource.
*/
public function edit($id)
{
$tujuanPenilaianKJPP = TujuanPenilaianKJPP::find($id);
return view('lpj::tujuan_penilaian_kjpp.create', compact('tujuanPenilaianKJPP'));
}
/**
* Update the specified resource in storage.
*/
public function update(JenisPenilaianKJPPRequest $request, $id)
{
$validate = $request->validated();
if ($validate) {
try {
$tujuanPenilaianKJPP = TujuanPenilaianKJPP::find($id);
$tujuanPenilaianKJPP->update($validate);
return redirect()
->route('basicdata.tujuan_penilaian_kjpp.index')
->with('success', 'Tujuan Penilaian KJPP updated successfully');
} catch (Throwable $e) {
return redirect()
->route('basicdata.tujuan_penilaian_kjpp.edit', $id)
->with('success', 'Failed to update Tujuan Penilaian KJPP: ' . $e);
}
}
}
/**
* Remove the specified resource from storage.
*/
public function destroy($id)
{
try {
// Delete from database
$tujuanPenilaianKJPP = TujuanPenilaianKJPP::find($id);
$tujuanPenilaianKJPP->delete();
echo json_encode(['success' => true, 'message' => 'Tujuan Penilaian deleted successfully']);
} catch (Throwable $e) {
echo json_encode(['success' => false, 'message' => 'Failed to delete deleted']);
}
}
public function dataForDatatables(Request $request)
{
if (is_null($this->user) || !$this->user->can('jenis_jaminan.view')) {
//abort(403, 'Sorry! You are not allowed to view users.');
}
// Retrieve data from the database
$query = TujuanPenilaianKJPP::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('code', 'LIKE', "%$search%");
$q->orWhere('name', '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->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 TujuanPenilaianKJPPExport, 'jenis_laporan.xlsx');
}
}

46
app/Http/Requests/JenisLaporanRequest.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace Modules\Lpj\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class JenisLaporanRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
*/
public function rules(): array
{
$rules = [
'code' => 'required|max:5',
'name' => 'required|max:255',
];
if ($this->method() == 'PUT') {
$rules['code'] = 'required|max:5|unique:jenis_laporan,code,' . $this->id;
} else {
$rules['code'] = 'required|max:5|unique:jenis_laporan,code';
}
return $rules;
}
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
public function messages(): array
{
return [
'code.required' => 'Kode Jenis Laporan Wajib diisi!',
'code.max' => 'Kode Jenis Laporan maksimum 5 huruf!',
'code.unique' => 'Kode Jenis Laporan tidak boleh sama!',
'name.required' => 'Nama Jenis Laporan Wajib diisi!',
'name.max' => 'Nama Jenis Laporan Wajib diisi!'
];
}
}

45
app/Http/Requests/JenisPenilaianKJPPRequest.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
namespace Modules\Lpj\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class JenisPenilaianKJPPRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
*/
public function rules(): array
{
$rules = [
'code' => 'required|max:5',
'name' => 'required|max:255',
];
if ($this->method() == 'PUT') {
$rules['code'] = 'required|max:5|unique:tujuan_penilaian_kjpp,code,' . $this->id;
} else {
$rules['code'] = 'required|max:5|unique:tujuan_penilaian_kjpp,code';
}
return $rules;
}
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
public function messages(): array
{
return [
'code.required' => 'Kode Tujuan Penilaian KJPP Wajib diisi!',
'code.max' => 'Kode Tujuan Penilaian KJPP maksimum 5 huruf!',
'code.unique' => 'Kode Tujuan Penilaian KJPP tidak boleh sama!',
'name.required' => 'Nama Tujuan Penilaian KJPP Wajib diisi!',
'name.max' => 'Nama Tujuan Penilaian KJPP Wajib diisi!'
];
}
}

18
app/Http/Requests/KJPPRequest.php
View File

@@ -32,8 +32,10 @@ class KJPPRequest extends FormRequest
'nomor_hp_pic_admin' => 'required|numeric|digits_between:10,15',
'nama_pic_marketing' => 'required|string|not_regex:/^\d+$/|max:255',
'nomor_hp_pic_marketing' => 'required|numeric|digits_between:10,15',
'ijin_usaha_id' => 'nullable',
'jenis_aset_id' => 'nullable',
'ijin_usaha_id' => 'required|array',
'ijin_usaha_id.*' => 'exists:ijin_usaha,code',
'jenis_aset_id' => 'required|array',
'jenis_aset_id.*' => 'exists:jenis_jaminan,code',
'attachment' => 'nullable|mimes:pdf|max:1024'
];
@@ -54,14 +56,6 @@ class KJPPRequest extends FormRequest
return true;
}
public function prepareForValidation(): void
{
$this->merge([
'ijin_usaha_id' => json_encode($this->ijin_usaha_id),
'jenis_aset_id' => json_encode($this->jenis_aset_id)
]);
}
public function messages(): array
{
return [
@@ -106,6 +100,10 @@ class KJPPRequest extends FormRequest
'nomor_hp_pic_marketing.required' => 'Nomor HP PIC Marketing Wajib diisi!',
'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!',
'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!',
'ijin_usaha_id.required' => 'Ijin Usaha Wajib diisi!',
'ijin_usaha_id.min' => 'Ijin Usaha Wajib diisi minimal satu atau lebih!',
'jenis_aset_id.required' => 'Jenis Aset Wajib diisi!',
'jenis_aset_id.min' => 'Jenis Aset Wajib diisi minimal satu atau lebih!',
'attachment.mimes' => 'Attachment harus berformat pdf!',
'attachment.max' => 'Attachment berukuran maksimum 1 MB!',
];

75
app/Http/Requests/TenderPenawaranRequest.php Normal file
View File

@@ -0,0 +1,75 @@
<?php
namespace Modules\Lpj\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class TenderPenawaranRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
*/
public function rules(): array
{
$rules = [
'nama_kjpp_sebelumnya' => 'required|array',
'nama_kjpp_sebelumnya.*' => 'exists:kjpp,name',
'biaya_kjpp_sebelumnya' => 'required|numeric',
'tanggal_penilaian_sebelumnya' => 'required',
'nomor_registrasi' => 'required',
'tujuan_penilaian_kjpp_id' => 'required',
'jenis_laporan_id' => 'required',
'start_date' => 'required',
'end_date' => 'required',
'catatan' => 'nullable',
'status' => 'required'
];
if ($this->method() == 'PUT') {
$rules['code'] = 'required|max:50|unique:penawaran,code,' . $this->id;
} else {
$rules['code'] = 'required|max:50|unique:penawaran,code';
}
return $rules;
}
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
public function messages(): array
{
return [
'code.required' => 'Kode Penawaran Wajib diisi!',
'code.max' => 'Kode Penawaran maksimal 255 huruf!',
'code.unique' => 'Kode Penawaran tidak boleh sama!',
'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!',
'biaya_kjpp_sebelumnya.required' => 'Biaya KJPP Sebelumnya Wajib diisi!',
'biaya_kjpp_sebelumnya.numeric' => 'Biaya KJPP Sebelumnya harus berupa angka!',
'tanggal_penilaian_sebelumnya.required' => 'Tanggal Penilaian Sebelumnya Wajib diisi!',
'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!',
'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!',
'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!',
'start_date.required' => 'Tanggal Awal Wajib diisi!',
'end_date.required' => 'Tanggal Akhir Wajib diisi!',
'status.required' => 'Status Wajib diisi!'
];
}
public function withValidator($validator)
{
$validator->after(function ($validator) {
$startDate = strtotime($this->input('start_date'));
$endDate = strtotime($this->input('end_date'));
if ($endDate < $startDate) {
$validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.');
}
});
}
}