Merge pull request 'menghapus proses_penawaran dari web.php, breadcrumb.php dan views proses_penawaran karena sudah tak terpakai' (#23) from tender into staging

Reviewed-on: #23
2024-10-21 03:20:12 +00:00
parent 965dc81d84 7708c14872
commit a3f1d17ca5
7 changed files with 163 additions and 192 deletions
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -38,7 +38,7 @@ class ProsesPenawaranController extends Controller
        }

        // Retrieve data from the database
-        $query =PenawaranTender::query()->where('status','=','tender')->withCount('penawarandetails'); 
+        $query = PenawaranTender::query()->where('status', '=', 'tender')->withCount('penawarandetails');

        // Apply search filter if provided
        if ($request->has('search') && !empty($request->get('search'))) {
@@ -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'));
@@ -109,26 +109,24 @@ class ProsesPenawaranController extends Controller
        if (request()->ajax()) {
            $id = $request->id;
            $penawaran = PenawaranTender::findOrFail($id);
-            $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)
+            $penawrandetails = PenawaranDetailTender::where('penawaran_id', '=', $id)
                ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
                ->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
-                                ->where('detail_penawaran.status','=',1)
+                ->where('detail_penawaran.status', '=', 1)
                ->get();
            $data['status'] = 'success';
            if ($penawaran) {
-                $i=0;
-                foreach($penawrandetails as $obj)
-                {
+                $i = 0;
+                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++;
                    }
                }

-                $kjpp=null;
+                $kjpp = null;
                $kjpp = KJPP::pluck('name', 'id');
                $data['penawaran'] = $penawaran;
                $data['penawrandetails'] = $penawrandetails;
@@ -161,29 +159,26 @@ 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)
+                        '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()) 
-                        {
-                            $myFile=$file_tmp->getClientOriginalName(); // nama file with extension 
+                        if ($file_tmp->isValid()) {
+                            $myFile = $file_tmp->getClientOriginalName(); // nama file with extension
                            $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension

                            $extension = $file_tmp->getClientOriginalExtension();
                            // kjppID_penawaranID_namaFile_userID_time
-                            $newFileName = $request->kjpp_rekanan_id.'_'.$id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
-                            Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
+                            $newFileName = $request->kjpp_rekanan_id . '_' . $id . '_' . $file_name . '_' . Auth::user()->id . "_" . time() . '.' . $extension;
+                            Storage::disk('public')->put($folderPath . '/' . $newFileName, file_get_contents($file_tmp));

                            $newFileNameWithPath = $folderPath . $newFileName;
                            $dataku['attachment'] = $myFile;
@@ -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,25 +247,25 @@ 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()
                    ];

-                    $permohonan = Permohonan::where('nomor_registrasi','=', $model->nomor_registrasi)->first();
+                    $permohonan = Permohonan::where('nomor_registrasi', '=', $model->nomor_registrasi)->first();

                    $model->update($dataku);
                    $permohonan->update($dataPermohonan);
@@ -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';
        }
@@ -316,38 +298,31 @@ class ProsesPenawaranController extends Controller
        $end_date = strtotime($end_date1);
        $todays_date = strtotime(now());

-        $allow=true;
-        if ($todays_date >= $start_date && $todays_date <= $end_date)
-        {
+        $allow = true;
+        if ($todays_date >= $start_date && $todays_date <= $end_date) {
            //Penawaran dibuka
-            $allow=true;
-        }
-        else
-        {
-            if($todays_date < $start_date)
-            {
+            $allow = true;
+        } else {
+            if ($todays_date < $start_date) {
                //Penawaran Belum dibuka
-                $allow=true;
-            }
-            else
-            {
+                $allow = true;
+            } else {
                //Penawaran sudah ditutup
-                $allow=false;
+                $allow = false;
            }
        }

        return $allow;
-
    }

    public function checkKelengkapanDetailKJPP($id)
    {
-        $allow=true;
+        $allow = true;
        // DB::enableQueryLog();
        // detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap?
        $query = PenawaranDetailTender::select('id')
-                                    ->where('penawaran_id','=',$id)
-                                    ->where(function($query) {
+            ->where('penawaran_id', '=', $id)
+            ->where(function ($query) {
                $query->orWhere('biaya_penawaran', '', "");
                $query->orWhereNull('biaya_penawaran');

@@ -360,13 +335,11 @@ class ProsesPenawaranController extends Controller
        // $sql = DB::getQueryLog();


-        if (sizeof($query)>0)
-        {
-            $allow=false;
+        if (sizeof($query) > 0) {
+            $allow = false;
        }

        return $allow;
-
    }

    public function updateStatusPenawaranKJPP(Request $request, $id): JsonResponse
@@ -377,9 +350,10 @@ class ProsesPenawaranController extends Controller

        try {
            $model = PenawaranDetailTender::findOrFail($id);
-            $data['id']=$id;
+            $data['id'] = $id;

-            $dataku = ['status' => '0',
+            $dataku = [
+                'status' => '0',
                'updated_by' => Auth::id(),
                'updated_at' => now()
            ];
@@ -400,6 +374,6 @@ class ProsesPenawaranController extends Controller
    public function show($id)
    {
        $prosespenawaran  = PenawaranTender::find($id);
-        return view('lpj::prosespenawaran.show', compact('id','prosespenawaran'));
+        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
    }
 }
--- a/app/Http/Controllers/TenderController.php
+++ b/app/Http/Controllers/TenderController.php
@@ -395,11 +395,6 @@ class TenderController extends Controller
        ]);
    }

-    public function proses_penawaran_index()
-    {
-        return view('lpj::proses_penawaran/index');
-    }
-
    // Tambahkan method untuk API di controller
    public function checkPenawaranExistence($nomor_registrasi)
    {
--- a/app/Models/PenawaranTender.php
+++ b/app/Models/PenawaranTender.php
@@ -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');
+    }
 }
--- a/resources/views/proses_penawaran/index.blade.php
+++ b/resources/views/proses_penawaran/index.blade.php
@@ -1,22 +0,0 @@
-@extends('layouts.main')
-
-@section('breadcrumbs')
-    {{ Breadcrumbs::render('tender.proses.penawaran') }}
-@endsection
-
-@section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-
-        <div class="card pb-2.5">
-            <div class="card-header" id="basic_settings">
-                <h3 class="card-title">
-                    Data Proses Penawaran
-                </h3>
-
-            </div>
-            <div class="card-body">
-                {{-- @include('lpj::debitur.form') --}}
-            </div>
-        </div>
-    </div>
-@endsection
--- a/resources/views/prosespenawaran/index.blade.php
+++ b/resources/views/prosespenawaran/index.blade.php
@@ -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,11 +27,12 @@
            </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">
-                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                                    <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
                                </th>
                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
                                    <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
@@ -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,10 +82,32 @@

@push('scripts')
    <script type="text/javascript">
-        function showPenawaranData(regId)
-        {
-            var url = "{{ url('tender/prosespenawaran') }}/"+regId;
-            $(location).attr('href',url);
+        function formatDate(date) {
+            const day = date.getDate().toString().padStart(2, '0');
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            // Months are 0-indexed
+            const year = date.getFullYear();
+
+            return `${day} ${getIndonesianMonth(month)} ${year}`;
+        }
+
+        function getIndonesianMonth(month) {
+            const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
+                'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
+            ];
+            return months[month -
+                1];
+        }
+
+        function capitalizeWords(str) {
+            return str.replace(/\b\w/g, function(char) {
+                return char.toUpperCase();
+            });
+        }
+
+        function showPenawaranData(regId) {
+            var url = "{{ url('tender/prosespenawaran') }}/" + regId;
+            $(location).attr('href', url);
        }
    </script>
    <script type="module">
@@ -111,9 +137,15 @@
                },
                start_date: {
                    title: 'Tanggal Penawaran',
+                    render: (item, data) => {
+                        return `${formatDate(new Date(data.start_date))} - ${formatDate(new Date(data.end_date))}`
+                    }
                },
-                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',
@@ -122,7 +154,10 @@
                    },
                },
                status: {
-                    title: 'Status'
+                    title: 'Status',
+                    render: (item, data) => {
+                        return capitalizeWords(data.status)
+                    }
                },
                actions: {
                    title: 'Status',
@@ -142,12 +177,10 @@

        let dataTable = new KTDataTable(element, dataTableOptions);
        // Custom search functionality
-        searchInput.addEventListener('input', function () {
+        searchInput.addEventListener('input', function() {
            const searchValue = this.value.trim();
            dataTable.search(searchValue, true);

        });
-
-
    </script>
@endpush
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -416,11 +416,6 @@ Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $tr
    $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
 });

-Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender');
-    $trail->push('Data Proses Penawaran', route('tender.proses_penawaran.index'));
-});
-

 Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
    $trail->parent('tender');
--- a/routes/web.php
+++ b/routes/web.php
@@ -384,9 +384,6 @@ Route::middleware(['auth'])->group(function () {
                ->name($type . '.index')
                ->defaults('type', $type);
        }
-
-
-
    });

    Route::name('permohonan.')->prefix('permohonan')->group(function () {
@@ -468,11 +465,6 @@ Route::middleware(['auth'])->group(function () {
        Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
            'penawaran.ulang.datatables',
        );
-
-        // Proses Penawaran
-        Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name(
-            'proses_penawaran.index',
-        );
    });

    Route::name('penilaian.')->prefix('penilaian')->group(function () {
@@ -535,10 +527,7 @@ Route::middleware(['auth'])->group(function () {
        Route::get('denah/{id}', [SurveyorController::class, 'denah'])->name('denah');
        Route::get('foto/{id}', [SurveyorController::class, 'foto'])->name('foto');
        Route::get('data-pembanding/{id}', [SurveyorController::class, 'dataPembanding'])->name('data-pembanding');
-
-
    });
-
 });

 require __DIR__ . '/registrasi.php';