penggabungan feature proses penawaran dan feature proses penawaran ulang, dan terkait keinginan user
This commit is contained in:
Andy Chaerudin
@@ -3,10 +3,19 @@
|
||||
namespace Modules\Lpj\Http\Controllers;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Carbon\Carbon;
|
||||
use Exception;
|
||||
use Carbon\Carbon;
|
||||
use Exception;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Modules\Lpj\Models\PenawaranTender;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
use Modules\Lpj\Models\Regions;
|
||||
|
||||
// use Modules\Location\Models\City;
|
||||
// use Modules\Location\Models\District;
|
||||
// use Modules\Location\Models\Province;
|
||||
@@ -20,15 +29,6 @@ use Exception;
|
||||
// use Modules\Lpj\Models\JenisJaminan;
|
||||
// use Modules\Lpj\Models\JenisLegalitasJaminan;
|
||||
// use Modules\Lpj\Models\PemilikJaminan;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
use Modules\Lpj\Models\JenisPenilaian;
|
||||
use Modules\Lpj\Models\Regions;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Modules\Lpj\Models\PenawaranTender;
|
||||
|
||||
class RegistrasiFinalController extends Controller
|
||||
{
|
||||
@@ -46,12 +46,12 @@ use Modules\Lpj\Models\PenawaranTender;
|
||||
}
|
||||
|
||||
// Retrieve data from the database
|
||||
// data.id => penawaran.id
|
||||
$query =PenawaranTender::query()
|
||||
->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
|
||||
->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
|
||||
->where('penawaran.status','=','spk')
|
||||
->withCount('penawarandetails');
|
||||
$query = PenawaranTender::with(['permohonan', 'tujuanPenilaianKjpp'])->whereHas(
|
||||
'permohonan',
|
||||
function ($q) {
|
||||
$q->where('status', '=', 'spk');
|
||||
},
|
||||
)->withCount('penawarandetails');
|
||||
|
||||
// Apply search filter if provided
|
||||
if ($request->has('search') && !empty($request->get('search'))) {
|
||||
@@ -90,25 +90,23 @@ use Modules\Lpj\Models\PenawaranTender;
|
||||
//$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
|
||||
$data = $query->with(['permohonan'])->get();
|
||||
// dd($data);
|
||||
$i=0;
|
||||
foreach($data as $obj)
|
||||
{
|
||||
if($obj->tanggal_penilaian_sebelumnya)
|
||||
{
|
||||
$data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
|
||||
$i = 0;
|
||||
foreach ($data as $obj) {
|
||||
if ($obj->tanggal_penilaian_sebelumnya) {
|
||||
$data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format(
|
||||
'd F Y H:i:s',
|
||||
);
|
||||
}
|
||||
|
||||
if($obj->biaya_kjpp_sebelumnya)
|
||||
{
|
||||
if ($obj->biaya_kjpp_sebelumnya) {
|
||||
$data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya);
|
||||
|
||||
}
|
||||
|
||||
// date_range
|
||||
if($obj->start_date && $obj->end_date)
|
||||
{
|
||||
$data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y');
|
||||
|
||||
if ($obj->start_date && $obj->end_date) {
|
||||
$data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . Carbon::parse(
|
||||
$obj->end_date,
|
||||
)->format('d M Y');
|
||||
}
|
||||
|
||||
$i++;
|
||||
@@ -129,24 +127,20 @@ use Modules\Lpj\Models\PenawaranTender;
|
||||
'pageCount' => $pageCount,
|
||||
'page' => $currentPage,
|
||||
'totalCount' => $totalRecords,
|
||||
'data' => $data
|
||||
'data' => $data,
|
||||
]);
|
||||
}
|
||||
|
||||
public function show($id)
|
||||
{
|
||||
// $id => penawaran.id
|
||||
$penawaran = PenawaranTender::find($id);
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
|
||||
|
||||
if($permohonan->dokumen)
|
||||
{
|
||||
$pdfSPK_path = Storage::url($permohonan->dokumen);
|
||||
$permohonan = Permohonan::find($id);
|
||||
if ($permohonan->dokumen) {
|
||||
$pdfSPK_path = Storage::url($permohonan->dokumen);
|
||||
$permohonan->dokumen = $pdfSPK_path;
|
||||
$permohonan->dokumen = '| <a download href="'. $pdfSPK_path.'" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf <i class="ki-filled ki-cloud-download"></i></a>';
|
||||
}
|
||||
$permohonan->dokumen = '| <a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf <i class="ki-filled ki-cloud-download"></i></a>';
|
||||
}
|
||||
|
||||
return view('lpj::registrasifinal.show', compact('id','permohonan'));
|
||||
return view('lpj::registrasifinal.show', compact('id', 'permohonan'));
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -155,130 +149,123 @@ use Modules\Lpj\Models\PenawaranTender;
|
||||
return view('lpj::registrasifinal.edit', compact('id'));
|
||||
}
|
||||
|
||||
public function setData(Request $request): JsonResponse
|
||||
{
|
||||
$data = array();
|
||||
$datas = array();
|
||||
$penawaran=null;
|
||||
$regions=null;
|
||||
public function setData(Request $request)
|
||||
: JsonResponse {
|
||||
$data = [];
|
||||
$datas = [];
|
||||
|
||||
if (request()->ajax()) {
|
||||
// $id => penawaran.id
|
||||
$id = $request->id;
|
||||
$penawaran = PenawaranTender::find($id);
|
||||
$datas = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
|
||||
$id = $request->id;
|
||||
$datas = Permohonan::find($id);
|
||||
|
||||
if ($datas) {
|
||||
|
||||
$regions=Regions::pluck('name', 'id');
|
||||
$penawaran = null;
|
||||
$regions = null;
|
||||
$regions = Regions::pluck('name', 'id');
|
||||
$penawaran = PenawaranTender::where('nomor_registrasi', '=', $datas->nomor_registrasi)->first();
|
||||
|
||||
$penawaranString = "";
|
||||
if($penawaran->status)
|
||||
{
|
||||
$penawaranString = convertSlug($penawaran->status);
|
||||
if ($penawaran->status) {
|
||||
$penawaranString = convertSlug($penawaran->status);
|
||||
$penawaran->status = $penawaranString;
|
||||
}
|
||||
|
||||
if($datas->dokumen)
|
||||
{
|
||||
$pdfSPK_path = Storage::url($datas->dokumen);
|
||||
}
|
||||
|
||||
if ($datas->dokumen) {
|
||||
$pdfSPK_path = Storage::url($datas->dokumen);
|
||||
$datas->dokumen = $pdfSPK_path;
|
||||
}
|
||||
|
||||
$data['status'] = 'success';
|
||||
$data['regions'] = $regions;
|
||||
$data['penawaran'] = $penawaran;
|
||||
$data['datas'] = $datas;
|
||||
$data['message']['message_success'] = array("data successfully found");
|
||||
$data['status'] = 'success';
|
||||
$data['regions'] = $regions;
|
||||
$data['penawaran'] = $penawaran;
|
||||
$data['datas'] = $datas;
|
||||
$data['message']['message_success'] = ["data successfully found"];
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['datas'] = null;
|
||||
$data['message']['message_data'] = array("data not found");
|
||||
$data['status'] = 'error';
|
||||
$data['datas'] = null;
|
||||
$data['message']['message_data'] = ["data not found"];
|
||||
}
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_ajax'] = array("no ajax request");
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_ajax'] = ["no ajax request"];
|
||||
}
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function update(Request $request, $id): JsonResponse
|
||||
{
|
||||
public function update(Request $request, $id)
|
||||
: JsonResponse {
|
||||
// init
|
||||
$data = array();
|
||||
$dataPermohonan = array();
|
||||
$dataPenawaran = array();
|
||||
$data = [];
|
||||
$dataPermohonan = [];
|
||||
$dataPenawaran = [];
|
||||
|
||||
if (request()->ajax()) {
|
||||
$validator = RegistrasiFinalController::rulesEditnya($request, $id);
|
||||
|
||||
if ($validator['fails']) {
|
||||
$data['message'] = $validator['errors'];
|
||||
$data['status'] = 'error';
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['status'] = 'error';
|
||||
} else {
|
||||
DB::beginTransaction();
|
||||
try {
|
||||
|
||||
// update table permohonan => status (registrasi-final), region_id, keterangan, authorized_at, authorized_status, authorized_by
|
||||
// update table penawaran => status (registrasi-final)
|
||||
$dataPermohonan = [
|
||||
'status' => 'registrasi-final',
|
||||
'region_id' => $request->region,
|
||||
'keterangan' => $request->catatan,
|
||||
'authorized_at' => now(),
|
||||
'authorized_status' =>1,
|
||||
'authorized_by' => Auth::id()
|
||||
];
|
||||
'status' => 'registrasi-final',
|
||||
'region_id' => $request->region,
|
||||
'keterangan' => $request->catatan,
|
||||
'authorized_at' => now(),
|
||||
'authorized_status' => 1,
|
||||
'authorized_by' => Auth::id(),
|
||||
];
|
||||
|
||||
$dataPenawaran = ['status' => 'registrasi-final'];
|
||||
|
||||
// $id => penawaran.id
|
||||
$penawaran = PenawaranTender::find($id);
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
|
||||
|
||||
$permohonan = Permohonan::find($id);
|
||||
$penawaran = PenawaranTender::where('nomor_registrasi', '=', $permohonan->nomor_registrasi)
|
||||
->first();
|
||||
|
||||
$permohonan->update($dataPermohonan);
|
||||
$penawaran->update($dataPenawaran);
|
||||
//
|
||||
DB::commit();
|
||||
|
||||
$data['status'] = 'success';
|
||||
$data['message']['message_success'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' successfully');
|
||||
$data['status'] = 'success';
|
||||
$data['message']['message_success'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' successfully'];
|
||||
} catch (Exception $e) {
|
||||
DB::rollBack();
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.');
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_try_catch'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' failed.'];
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_ajax'] = array("no ajax request");
|
||||
$data['status'] = 'error';
|
||||
$data['message']['message_ajax'] = ["no ajax request"];
|
||||
}
|
||||
|
||||
return response()->json($data);
|
||||
|
||||
}
|
||||
|
||||
public function rulesEditnya($request, $id)
|
||||
{
|
||||
$validate_catatan='';
|
||||
$validate_catatan = '';
|
||||
|
||||
$validateIt = [
|
||||
// 'name' diambil dari definisi parameter yang di kirim pada POST Data
|
||||
'region' => 'required',
|
||||
'region' => 'required',
|
||||
'catatan' => 'required',
|
||||
];
|
||||
|
||||
$messageIt = [
|
||||
'region.required' => 'Silahkan pilih Region',
|
||||
'catatan.required' => 'Silahkan isi Catatan'
|
||||
'region.required' => 'Silahkan pilih Region',
|
||||
'catatan.required' => 'Silahkan isi Catatan',
|
||||
];
|
||||
|
||||
$validator = Validator::make($request->all(), $validateIt, $messageIt);
|
||||
|
||||
$data['fails'] = $validator->fails();
|
||||
$data['fails'] = $validator->fails();
|
||||
$data['errors'] = $validator->errors();
|
||||
|
||||
return $data;
|
||||
|
||||
Reference in New Issue
Block a user