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

Mengubah Tujuan Penilaian KJPP sebelumnya diambil dari tabel penawaran.tujuan_penilaian_kjpp_id menjadi tabel tujuan_penilaian_kjpp.name di proses_penawaran

Browse Source
This commit is contained in:
rahmatrafli1
2024-10-18 10:32:05 +07:00
parent 82d5b54d04
commit f8867005af
3 changed files with 133 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -46,7 +46,7 @@ class ProsesPenawaranController extends Controller
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('tujuanPenilaianKJPP', 'name', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}
@@ -75,7 +75,7 @@ class ProsesPenawaranController extends Controller
// Get the data for the current page
//$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
$data = $query->get();
$data = $query->with(['tujuanPenilaianKJPP'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
@@ -117,11 +117,9 @@ class ProsesPenawaranController extends Controller
$data['status'] = 'success';
if ($penawaran) {
$i = 0;
foreach($penawrandetails as $obj)
{
foreach ($penawrandetails as $obj) {
// dd($obj->dokumen_persetujuan);
if($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan))
{
if ($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan)) {
$penawrandetails_path = Storage::url($obj->dokumen_persetujuan);
$penawrandetails[$i]->dokumen_persetujuan = $penawrandetails_path;
$i++;
@@ -161,22 +159,19 @@ class ProsesPenawaranController extends Controller
if ($validator['fails']) {
$data['message'] = $validator['errors'];
$data['status'] = 'error';
}
else
{
} else {
try {
$dataku = ['updated_by' => Auth::id(),
$dataku = [
'updated_by' => Auth::id(),
'updated_at' => now(),
'biaya_penawaran' => str_replace(".", "", $request->biaya_penawaran)
];
if ($request->hasFile('dokumen_persetujuan'))
{
if ($request->hasFile('dokumen_persetujuan')) {
$file_tmp = $request->file('dokumen_persetujuan');
$folderPath = 'uploads/penawaran/';
if ($file_tmp->isValid())
{
if ($file_tmp->isValid()) {
$myFile = $file_tmp->getClientOriginalName(); // nama file with extension
$file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
@@ -195,26 +190,20 @@ class ProsesPenawaranController extends Controller
$data['status'] = 'success';
$data['detailpenawaran_id'] = $id;
$data['message'] = 'Proses Penawarn KJPP successfully';
}
else
{
} else {
$data['status'] = 'error';
$data['message'] = 'Silahkan upload file pdf';
}
}
else
{
} else {
$data['status'] = 'error';
$data['message'] = 'Silahkan upload file';
}
} catch (Exception $e) {
$data['status'] = 'error';
$data['message'] = 'Proses Penawarn KJPP failed.';
}
}
} else {
$data['status'] = 'error';
$data['message'] = 'no ajax request';
@@ -258,20 +247,20 @@ class ProsesPenawaranController extends Controller
$checkActiveDateRange = $this->checkActiveDateRangePenawaran($model->start_date, $model->end_date);
// cek masa aktif penawaran
if($checkActiveDateRange)
{
if ($checkActiveDateRange) {
$checkKelengkapanDetailKJPP = $this->checkKelengkapanDetailKJPP($id);
if($checkKelengkapanDetailKJPP)
{
if ($checkKelengkapanDetailKJPP) {
DB::beginTransaction();
try {
$dataku = ['status' => 'tendered',
$dataku = [
'status' => 'tendered',
'updated_by' => Auth::id(),
'updated_at' => now()
];
$dataPermohonan = ['status' => 'tendered',
$dataPermohonan = [
'status' => 'tendered',
'updated_by' => Auth::id(),
'updated_at' => now()
];
@@ -285,24 +274,17 @@ class ProsesPenawaranController extends Controller
$data['message'] = "Sukses melakukan Proses Penawaran";
$data['status'] = 'success';
} catch (Exception $e) {
DB::rollBack();
// dd($e);
$data['message'] = "Gagal melakukan Proses Penawaran";
$data['status'] = 'error';
}
}
else
{
} else {
$data['message'] = "Silahkan lengkapi data KJPP";
$data['status'] = 'error';
}
}
else
{
} else {
$data['message'] = "Penawaran sudah di tutup";
$data['status'] = 'error';
}
@@ -317,27 +299,20 @@ class ProsesPenawaranController extends Controller
$todays_date = strtotime(now());
$allow = true;
if ($todays_date >= $start_date && $todays_date <= $end_date)
{
if ($todays_date >= $start_date && $todays_date <= $end_date) {
//Penawaran dibuka
$allow = true;
}
else
{
if($todays_date < $start_date)
{
} else {
if ($todays_date < $start_date) {
//Penawaran Belum dibuka
$allow = true;
}
else
{
} else {
//Penawaran sudah ditutup
$allow = false;
}
}
return $allow;
}
public function checkKelengkapanDetailKJPP($id)
@@ -360,13 +335,11 @@ class ProsesPenawaranController extends Controller
// $sql = DB::getQueryLog();
if (sizeof($query)>0)
{
if (sizeof($query) > 0) {
$allow = false;
}
return $allow;
}
public function updateStatusPenawaranKJPP(Request $request, $id): JsonResponse
@@ -379,7 +352,8 @@ class ProsesPenawaranController extends Controller
$model = PenawaranDetailTender::findOrFail($id);
$data['id'] = $id;
$dataku = ['status' => '0',
$dataku = [
'status' => '0',
'updated_by' => Auth::id(),
'updated_at' => now()
];

7
app/Models/PenawaranTender.php
View File

@@ -3,6 +3,7 @@
namespace Modules\Lpj\Models;
use Illuminate\Database\Eloquent\Model;
use Modules\Lpj\Models\TujuanPenilaianKJPP;
use Modules\Lpj\Models\PenawaranDetailTender;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany; // andy add
@@ -29,4 +30,10 @@ class PenawaranTender extends Model
{
return $this->hasMany(PenawaranDetailTender::class, 'penawaran_id');
}
// menambahkan relasi tujuan penilaian KJPP
public function tujuanPenilaianKJPP()
{
return $this->hasMany(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id');
}
}

24
resources/views/prosespenawaran/index.blade.php
View File

@@ -6,7 +6,9 @@
@section('content')
<div class="grid">
<div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="prosespenawaran-table" data-api-url="{{ route('tender.prosespenawaran.datatables') }}">
<div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
data-datatable-state-save="false" id="prosespenawaran-table"
data-api-url="{{ route('tender.prosespenawaran.datatables') }}">
<div class="card-header py-5 flex-wrap">
<h3 class="card-title">
Daftar Proses Penawaran
@@ -25,7 +27,8 @@
</div>
<div class="card-body">
<div class="scrollable-x-auto">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
data-datatable-table="true">
<thead>
<tr>
<th class="w-14">
@@ -44,7 +47,7 @@
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
<span class="sort"> <span class="sort-label"> Tujuan Penilaian KJPP </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="penawarandetails_count">
@@ -60,7 +63,8 @@
</thead>
</table>
</div>
<div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div class="flex items-center gap-2">
Show
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
@@ -78,8 +82,7 @@
@push('scripts')
<script type="text/javascript">
function showPenawaranData(regId)
{
function showPenawaranData(regId) {
var url = "{{ url('tender/prosespenawaran') }}/" + regId;
$(location).attr('href', url);
}
@@ -112,8 +115,11 @@
start_date: {
title: 'Tanggal Penawaran',
},
tujuan_penilaian_kjpp_id: {
title: 'Tujuan Penilaian',
tujuan_penilaian_k_j_p_p: {
title: 'Tujuan Penilaian KJPP',
render: (item, data) => {
return data.tujuan_penilaian_k_j_p_p[0].name
}
},
penawarandetails_count: {
title: 'Total KJPP',
@@ -147,7 +153,5 @@
dataTable.search(searchValue, true);
});
</script>
@endpush