From 734fdd03257aaf870cd1fc3b9e47f391b5eb9885 Mon Sep 17 00:00:00 2001
From: Gunawan19621 <gunawan19621@gmail.com>
Date: Mon, 20 Nov 2023 08:26:27 +0700
Subject: [PATCH 1/2] update disposal

---
 app/Http/Controllers/DisposalController.php   |  72 +++++++----
 app/Http/Controllers/HomeController.php       |  42 ++++++-
 .../Disposal/ValidasiCreateDisposal.php       |  43 +++++++
 .../Disposal/ValidasiUpdateDisposal.php       |  28 +++++
 app/Models/Disposal.php                       |  46 +++++++
 ...23_11_17_075418_create_disposals_table.php |  36 ++++++
 .../views/dashboard/Disposal/create.blade.php |  58 +++++++--
 .../views/dashboard/Disposal/edit.blade.php   | 118 +++++++++++++++++-
 .../views/dashboard/Disposal/index.blade.php  |  77 +++++++-----
 resources/views/dashboard/index.blade.php     |  98 +++++++++++----
 resources/views/layouts/sidebar.blade.php     |   8 +-
 routes/web.php                                |   4 +-
 12 files changed, 532 insertions(+), 98 deletions(-)
 create mode 100644 app/Http/Requests/Disposal/ValidasiCreateDisposal.php
 create mode 100644 app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
 create mode 100644 app/Models/Disposal.php
 create mode 100644 database/migrations/2023_11_17_075418_create_disposals_table.php

diff --git a/app/Http/Controllers/DisposalController.php b/app/Http/Controllers/DisposalController.php
index b1850e4..7cb9662 100644
--- a/app/Http/Controllers/DisposalController.php
+++ b/app/Http/Controllers/DisposalController.php
@@ -3,14 +3,19 @@
 namespace App\Http\Controllers;
 
 use App\Models\Peti;
+use App\Models\Customer;
 use App\Models\m_warehouse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Requests\Disposal\ValidasiCreateDisposal;
+use App\Models\Disposal;
 
 class DisposalController extends Controller
 {
     public function index()
     {
         $data = [
+            'disposal' => Disposal::all(),
             'active' => 'menu-disposal',
         ];
         return view('dashboard.Disposal.index', $data);
@@ -25,6 +30,7 @@ class DisposalController extends Controller
         $data = [
             'peti' => Peti::get(),
             'warehouse' => m_warehouse::get(),
+            'customer' => Customer::get(),
             'active' => 'menu-disposal',
         ];
         return view('dashboard.Disposal.create', $data);
@@ -33,52 +39,76 @@ class DisposalController extends Controller
     /**
      * Store a newly created resource in storage.
      */
-    public function store($request)
+    public function store(ValidasiCreateDisposal $request)
     {
-        //
+        // dd($request->all());
+        try {
+            // Mendapatkan informasi pengguna yang sedang login
+            $currentUser = Auth::user();
+
+            // Validasi data dari request
+            $validatedData = $request->validated();
+
+            // Menambahkan informasi pengguna ke dalam data yang akan disimpan
+            $validatedData['created_by'] = $currentUser->fullname;
+            $validatedData['updated_by'] = $currentUser->fullname;
+
+            // Membuat entitas Transfer
+            Disposal::create($validatedData);
+
+            return redirect()->route('dashboard.disposal.index')->with('success', 'Data Disposal Peti berhasil ditambahkan');
+        } catch (\Throwable $th) {
+            return redirect()->back()->with('error', 'Data Disposal Peti gagal dimasukan ke disposal');
+        }
     }
 
     /**
      * Display the specified resource.
      */
-    public function show($id)
-    {
-        $data = [
-            'active' => 'menu-disposal',
-        ];
-        return view('dashboard.Disposal.show', $data);
-    }
+    // public function show($id)
+    // {
+    //     $data = [
+    //         'active' => 'menu-disposal',
+    //     ];
+    //     return view('dashboard.Disposal.show', $data);
+    // }
 
     /**
      * Show the form for editing the specified resource.
      */
     public function edit($id)
     {
+        $jenis_disposal = ['Pemusnaan', 'Perbaikan'];
         $data = [
+            'disposal' => Disposal::findOrFail($id),
+            'peti' => Peti::get(),
+            'customer' => Customer::get(),
+            'warehouse' => m_warehouse::get(),
             'active' => 'menu-disposal',
         ];
-        return view('dashboard.Disposal.edit', $data);
+        return view('dashboard.Disposal.edit', compact('jenis_disposal'), $data);
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update($request, $id)
-    {
-        //
-    }
+    // public function update($request, $id)
+    // {
+    //     //
+    // }
 
     /**
      * Remove the specified resource from storage.
      */
     public function destroy($id)
     {
-        // try {
-        //     $typepeti = Peti::findOrFail($id);
-        //     $typepeti->delete();
-        //     return redirect()->back()->with('success', 'Data peti berhasil dihapus');
-        // } catch (\Throwable $th) {
-        //     return redirect()->back()->with('error', 'Data peti gagal dihapus');
-        // }
+        // dd("oke");
+        try {
+            $disposal = Disposal::findOrFail($id);
+            $disposal->delete();
+            return redirect()->back()->with('success', 'Data disposal peti berhasil dihapus');
+        } catch (\Throwable $th) {
+            return redirect()->back()->with('error', 'Data disposal peti gagal dihapus');
+        }
     }
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index f6a32ad..f612ab9 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -24,7 +24,6 @@ class HomeController extends Controller
     {
         $data = [
             'reminder' => \App\Models\asset_status::whereNull('enter_at')->count(),
-            'jumlahAsset' => \App\Models\m_asset::count(),
             'jumlahPeminjaman' => \App\Models\asset_status::count(),
             'jumlahPengembalian' => \App\Models\asset_status::whereNotNull('enter_at')->count(),
             'active' => 'menu-user',
@@ -32,6 +31,8 @@ class HomeController extends Controller
 
         return view('pages.user.index', $data);
     }
+
+    //data pertahun untuk bar chart
     public function generateChartData()
     {
         $years = [];
@@ -86,4 +87,43 @@ class HomeController extends Controller
 
         return compact('years', 'exitData', 'enterData', 'monthNames');
     }
+
+    public function generateChartDataPie()
+    {
+        $years = [];
+        $enterData = [];
+        $monthNames = [
+            'Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
+            'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
+        ];
+
+        // Ambil data tahun dari kolom date_pembuatan
+        $enterYears = \App\Models\Peti::selectRaw('YEAR(date_pembuatan) as year')
+            ->distinct()
+            ->orderBy('year', 'asc')
+            ->get()
+            ->pluck('year')
+            ->toArray();
+
+        // Gabungkan dan sortir tahun-tahun dari kolom date_pembuatan
+        $years = array_unique($enterYears);
+        sort($years);
+
+        foreach ($years as $year) {
+            $yearEnterData = [];
+
+            // Ambil data untuk setiap bulan dalam tahun tersebut
+            foreach ($monthNames as $monthName) {
+                $enterCount = \App\Models\Peti::whereYear('date_pembuatan', $year)
+                    ->whereMonth('date_pembuatan', array_search($monthName, $monthNames) + 1)
+                    ->count();
+
+                $yearEnterData[] = $enterCount;
+            }
+
+            $enterData[] = $yearEnterData;
+        }
+
+        return compact('years', 'enterData', 'monthNames');
+    }
 }
diff --git a/app/Http/Requests/Disposal/ValidasiCreateDisposal.php b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php
new file mode 100644
index 0000000..77429c6
--- /dev/null
+++ b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Requests\Disposal;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ValidasiCreateDisposal extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'peti_id' => 'nullable',
+            'customer_id' => 'nullable',
+            'warehouse_id' => 'nullable',
+            'date_disposal' => 'nullable|date',
+            'description' => 'nullable|string',
+            'jenis_disposal' => 'nullable|string|max:50',
+        ];
+    }
+
+    public function messages(): array
+    {
+        return [
+            'date_disposal.date' => 'Format tanggal disposal tidak valid.',
+            'description.string' => 'Deskripsi harus berupa teks.',
+            'jenis_disposal.string' => 'Jenis disposal harus berupa teks.',
+            'jenis_disposal.max' => 'Jenis disposal tidak boleh lebih dari :max karakter.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
new file mode 100644
index 0000000..66e086d
--- /dev/null
+++ b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Disposal;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ValidasiUpdateDisposal extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Models/Disposal.php b/app/Models/Disposal.php
new file mode 100644
index 0000000..bc463cd
--- /dev/null
+++ b/app/Models/Disposal.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\UUID;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Disposal extends Model
+{
+    use HasFactory, SoftDeletes, UUID;
+    protected $table = 'disposals';
+
+    protected $fillable = [
+        'peti_id',
+        'customer_id',
+        'date_disposal',
+        'warehouse_id',
+        'description',
+        'jenis_disposal',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function peti()
+    {
+        return $this->belongsTo(Peti::class, 'peti_id')->select(
+            'id',
+            'tipe_peti_id',
+            'customer_id',
+            'warehouse_id',
+            'date_pembuatan',
+            'kondisipeti_id',
+            'fix_lot',
+            'updated_by',
+        );
+    }
+    public function customer()
+    {
+        return $this->belongsTo(Customer::class, 'customer_id')->select(
+            'name',
+            'code_customer',
+        );
+    }
+}
diff --git a/database/migrations/2023_11_17_075418_create_disposals_table.php b/database/migrations/2023_11_17_075418_create_disposals_table.php
new file mode 100644
index 0000000..f734f9b
--- /dev/null
+++ b/database/migrations/2023_11_17_075418_create_disposals_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('disposals', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null');
+            $table->foreignUuid('customer_id')->nullable()->constrained('customers');
+            $table->foreignUuid('warehouse_id')->nullable()->constrained('m_warehouses');
+            $table->date('date_disposal')->nullable();
+            $table->text('description')->nullable();
+            $table->string('jenis_disposal', 50)->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+            $table->string('created_by', 200)->nullable();
+            $table->string('updated_by', 200)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('disposals');
+    }
+};
diff --git a/resources/views/dashboard/Disposal/create.blade.php b/resources/views/dashboard/Disposal/create.blade.php
index 3b57099..5bd4587 100644
--- a/resources/views/dashboard/Disposal/create.blade.php
+++ b/resources/views/dashboard/Disposal/create.blade.php
@@ -10,8 +10,8 @@
             </div>
         </div>
         <div class="card-body">
-            <form action="{{ route('dashboard.transfer.store') }}" method="POST" enctype="multipart/form-data"
-                id="transferForm">
+            <form action="{{ route('dashboard.disposal.store') }}" method="POST" enctype="multipart/form-data"
+                id="disposalForm">
                 @csrf
                 <div class="form-group">
                     <label for="peti_id" class="col-form-label">Pilih Detail Peti: <span
@@ -26,9 +26,38 @@
                         @endforeach
                     </select>
 
-                    <label for="name" class="col-form-label">Customer: <span class="text-danger">*</span></label>
-                    <input class="form-control" name="name" type="text" id="name"
-                        placeholder="Nama Customer akan otomatis terpilih ketika memilih detail peti.">
+                    <label for="customer_id" class="col-form-label">Customer: <span class="text-danger">*</span></label>
+                    <select class="form-control" name="customer_id" type="text" id="customer_id">
+                        <option disabled selected>Nama Customer akan otomatis terpilih ketika memilih detail peti.</option>
+                        @foreach ($customer as $data_customer)
+                            <option value="{{ $data_customer->id }}">{{ $data_customer->name }}</option>
+                        @endforeach
+                    </select>
+
+                    <label for="date_disposal" class="col-form-label">Tanggal Disposal: <span
+                            class="text-danger">*</span></label>
+                    <input class="form-control" name="date_disposal" type="date" id="date_disposal"
+                        value="{{ old('date_disposal') }}">
+
+                    <label for="warehouse_id" class="col-form-label">Asal Gudang: <span class="text-danger">*</span></label>
+                    <select class="form-control" name="warehouse_id" type="text" id="warehouse_id">
+                        <option disabled selected>Asal gudang akan otomatis terpilih ketika memilih detail peti.</option>
+                        @foreach ($warehouse as $data)
+                            <option value="{{ $data->id }}">{{ $data->name }}</option>
+                        @endforeach
+                    </select>
+
+                    <label for="description" class="col-form-label">Alasan Disposal: <span
+                            class="text-danger">*</span></label>
+                    <textarea class="form-control" name="description" id="description" placeholder="Masukan Alasan Disposal" required>{{ old('description') }}</textarea>
+
+                    <label for="jenis_disposal" class="col-form-label">Jenis Disposal: <span
+                            class="text-danger">*</span></label>
+                    <select class="form-control" name="jenis_disposal" id="jenis_disposal">
+                        <option disabled selected>Pilih Jenis Disposal</option>
+                        <option value="Pemusnaan">Pemusnaan</option>
+                        <option value="Perbaikan">Perbaikan</option>
+                    </select>
                 </div>
                 <div class="modal-footer d-flex justify-content-center">
                     <a href="{{ route('dashboard.disposal.index') }}" class="btn btn-secondary">Kembali</a>
@@ -40,7 +69,7 @@
 
     <!-- auto disable form pada saat sudah di simpan-->
     <script>
-        document.getElementById('transferForm').addEventListener('submit', function() {
+        document.getElementById('disposalForm').addEventListener('submit', function() {
             document.getElementById('submitButton').setAttribute('disabled', 'true');
         });
     </script>
@@ -51,10 +80,10 @@
         const petiSelect = document.getElementById('peti_id');
 
         // Mendapatkan elemen select asal gudang
-        const exitWarehouseSelect = document.getElementById('exit_warehouse');
+        const warehouseSelect = document.getElementById('warehouse_id');
 
-        // Mendapatkan elemen input Customer
-        const nameInput = document.getElementById('name');
+        // Mendapatkan elemen select Customer
+        const customerSelect = document.getElementById('customer_id');
 
         // Menambahkan event listener ke select detail peti
         petiSelect.addEventListener('change', function() {
@@ -66,10 +95,15 @@
             const customerName = selectedOption.getAttribute('data-customer-name');
 
             // Memilih asal gudang berdasarkan data-warehouse-id
-            exitWarehouseSelect.value = warehouseId;
+            warehouseSelect.value = warehouseId;
 
-            // Mengisi input Customer dengan nama pelanggan
-            nameInput.value = customerName;
+            // Memilih customer berdasarkan data-customer-name
+            for (let i = 0; i < customerSelect.options.length; i++) {
+                if (customerSelect.options[i].text === customerName) {
+                    customerSelect.selectedIndex = i;
+                    break;
+                }
+            }
         });
     </script>
 @endsection
diff --git a/resources/views/dashboard/Disposal/edit.blade.php b/resources/views/dashboard/Disposal/edit.blade.php
index be1e99e..fa89605 100644
--- a/resources/views/dashboard/Disposal/edit.blade.php
+++ b/resources/views/dashboard/Disposal/edit.blade.php
@@ -1,5 +1,121 @@
 @extends('layouts.main')
 @section('content')
     @include('layouts.components.alert-prompt')
-    <p>Halaman Edit Disposal</p>
+    @include('layouts.components.alert-prompt')
+    <div class="card shadow mb-4">
+        <div class="card-header py-3">
+            <div class="row">
+                <div class="col-6">
+                    <h5 class="m-0 font-weight-bold text-primary mt-2">Edit Disposal Peti</h5>
+                </div>
+            </div>
+        </div>
+        <div class="card-body">
+            <form action="{{ route('dashboard.disposal.store') }}" method="POST" enctype="multipart/form-data"
+                id="disposalForm">
+                @csrf
+                <div class="form-group">
+                    <label for="peti_id" class="col-form-label">Pilih Detail Peti: <span
+                            class="text-danger">*</span></label>
+                    <select class="form-control" name="peti_id" type="text" id="peti_id" required>
+                        <option disabled selected>Pilih Detail Peti</option>
+                        @foreach ($peti as $data_peti)
+                            <option value="{{ $data_peti->id }}" data-warehouse-id="{{ $data_peti->warehouse_id }}"
+                                data-customer-name="{{ $data_peti->customer->name }}"
+                                {{ $data_peti->id == $disposal->peti_id ? 'selected' : '' }}>
+                                {{ $data_peti->fix_lot }}
+                            </option>
+                        @endforeach
+                    </select>
+
+                    <label for="customer_id" class="col-form-label">Customer: <span class="text-danger">*</span></label>
+                    <select class="form-control" name="customer_id" type="text" id="customer_id" required>
+                        <option disabled selected>Pilih Customer</option>
+                        @foreach ($customer as $data_customer)
+                            <option value="{{ $data_customer->id }}"
+                                {{ $data_customer->id == $disposal->customer_id ? 'selected' : '' }}>
+                                {{ $data_customer->name }}
+                            </option>
+                        @endforeach
+                    </select>
+
+                    <label for="date_disposal" class="col-form-label">Tanggal Disposal: <span
+                            class="text-danger">*</span></label>
+                    <input class="form-control" name="date_disposal" type="date" id="date_disposal"
+                        value="{{ $disposal->date_disposal }}">
+
+
+
+
+
+                    <label for="warehouse_id" class="col-form-label">Asal Gudang: <span class="text-danger">*</span></label>
+                    <select class="form-control" name="warehouse_id" type="text" id="warehouse_id" required>
+                        <option disabled selected>Pilih Asal gudang</option>
+                        @foreach ($warehouse as $data_warehouse)
+                            <option value="{{ $data_warehouse->id }}"
+                                {{ $data_warehouse->id == $disposal->warehouse_id ? 'selected' : '' }}>
+                                {{ $data_warehouse->name }}
+                            </option>
+                        @endforeach
+                    </select>
+
+                    <label for="description" class="col-form-label">Alasan Disposal: <span
+                            class="text-danger">*</span></label>
+                    <textarea class="form-control" name="description" id="description" placeholder="Masukan Alasan Disposal" required>{{ $disposal->description }}</textarea>
+
+                    <label for="jenis_disposal" class="col-form-label">Jenis Disposal: <span
+                            class="text-danger">*</span></label>
+                    <select class="form-control" name="jenis_disposal" id="jenis_disposal">
+                        <option disabled selected>Pilih Jenis Disposal</option>
+                        <option value="Pemusnaan">Pemusnaan</option>
+                        <option value="Perbaikan">Perbaikan</option>
+                    </select>
+                </div>
+                <div class="modal-footer d-flex justify-content-center">
+                    <a href="{{ route('dashboard.disposal.index') }}" class="btn btn-secondary">Kembali</a>
+                    <button type="submit" class="btn btn-primary" id="submitButton">Simpan</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <!-- auto disable form pada saat sudah di simpan-->
+    <script>
+        document.getElementById('disposalForm').addEventListener('submit', function() {
+            document.getElementById('submitButton').setAttribute('disabled', 'true');
+        });
+    </script>
+
+    <!-- otomatis asal gudang dan Customer berdasarkan detail peti -->
+    <script>
+        // Mendapatkan elemen select detail peti
+        const petiSelect = document.getElementById('peti_id');
+
+        // Mendapatkan elemen select asal gudang
+        const warehouseSelect = document.getElementById('warehouse_id');
+
+        // Mendapatkan elemen select Customer
+        const customerSelect = document.getElementById('customer_id');
+
+        // Menambahkan event listener ke select detail peti
+        petiSelect.addEventListener('change', function() {
+            // Mendapatkan data-warehouse-id dari option yang dipilih
+            const selectedOption = this.options[this.selectedIndex];
+            const warehouseId = selectedOption.getAttribute('data-warehouse-id');
+
+            // Mendapatkan data-customer-name dari option yang dipilih
+            const customerName = selectedOption.getAttribute('data-customer-name');
+
+            // Memilih asal gudang berdasarkan data-warehouse-id
+            warehouseSelect.value = warehouseId;
+
+            // Memilih customer berdasarkan data-customer-name
+            for (let i = 0; i < customerSelect.options.length; i++) {
+                if (customerSelect.options[i].text === customerName) {
+                    customerSelect.selectedIndex = i;
+                    break;
+                }
+            }
+        });
+    </script>
 @endsection
diff --git a/resources/views/dashboard/Disposal/index.blade.php b/resources/views/dashboard/Disposal/index.blade.php
index 568ad0c..01a3b49 100644
--- a/resources/views/dashboard/Disposal/index.blade.php
+++ b/resources/views/dashboard/Disposal/index.blade.php
@@ -26,7 +26,7 @@
         </div>
         <div class="card-body">
             <div class="table-responsive">
-                <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+                {{-- <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
                     <thead>
                         <tr>
                             <th class="text-center">No</th>
@@ -61,43 +61,54 @@
                                 </form>
                             </td>
                         </tr>
-                        {{-- @php
-                            $no_peminjaman = 1;
+                    </tbody>
+                </table> --}}
+                <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+                    <thead>
+                        <tr>
+                            <th class="text-center">No</th>
+                            <th>Kode Peti</th>
+                            <th>Nama Customer</th>
+                            <th>Tanggal Disposal</th>
+                            <th>Alasan Disposal</th>
+                            <th>Jenis Disposal</th>
+                            <th class="text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @php
+                            $nodisposal = 1;
                         @endphp
-                        @forelse ($peminjaman as $data_peminjaman)
-                            @if ($data_peminjaman->enter_warehouse == null)
-                                <tr>
-                                    <td class="text-center">{{ $no_peminjaman++ }}</td>
-                                    <td>{{ $data_peminjaman->peti->fix_lot }}</td>
-                                    <td>{{ $data_peminjaman->peti->customer->name }}</td>
-                                    <td>{{ $data_peminjaman->peti->customer->code_customer }} -
-                                        {{ $data_peminjaman->peti->tipe_peti->type }}</td>
-                                    <td>{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }}</td>
-                                    <td>{{ $data_peminjaman->exit_pic }}</td>
-                                    <td>{{ $data_peminjaman->warehouse->name }}</td>
-                                    <td class="text-center">
-                                        <a href="{{ route('dashboard.peminjaman.edit', $data_peminjaman->id) }}"
-                                            title="Edit">
-                                            <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
-                                        </a>
-                                        <form action="{{ route('dashboard.peminjaman.destroy', $data_peminjaman->id) }}"
-                                            method="POST" style="display: inline;">
-                                            @csrf
-                                            @method('DELETE')
-                                            <button type="submit"
-                                                onclick="return confirm('Apakah Anda yakin ingin menghapus data ini?')"
-                                                title="Delete" style="border: none; background: none; cursor: pointer;">
-                                                <i class="fa fa-trash text-danger" style="font-size: 20px"></i>
-                                            </button>
-                                        </form>
-                                    </td>
-                                </tr>
-                            @endif
+                        @forelse ($disposal as $data_disposal)
+                            <tr>
+                                <td>{{ $nodisposal++ }}</td>
+                                <td>{{ $data_disposal->peti->fix_lot }}</td>
+                                <td>{{ $data_disposal->customer->name }}</td>
+                                <td>{{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d/m/Y') }}</td>
+                                <td>{{ $data_disposal->description }}</td>
+                                <td>{{ $data_disposal->jenis_disposal }}</td>
+                                <td class="text-center">
+                                    <a href="{{ route('dashboard.disposal.edit', $data_disposal->id) }}" title="Edit">
+                                        <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
+                                    </a>
+                                    <form action="{{ route('dashboard.disposal.destroy', $data_disposal->id) }}"
+                                        method="POST" style="display: inline;">
+                                        @csrf
+                                        @method('DELETE')
+                                        <button type="submit"
+                                            onclick="return confirm('Apakah Anda yakin ingin menghapus data ini?')"
+                                            title="Delete" style="border: none; background: none; cursor: pointer;">
+                                            <i class="fa fa-trash text-danger" style="font-size: 20px"></i>
+                                        </button>
+                                    </form>
+                                </td>
+                            </tr>
                         @empty
                             <p>Data Kosong</p>
-                        @endforelse --}}
+                        @endforelse
                     </tbody>
                 </table>
+
             </div>
         </div>
     </div>
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index a8970f9..564d641 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -87,7 +87,7 @@
         </div>
 
         <!-- Area Bar Chart -->
-        <div class="col-xl-7 col-lg-7">
+        {{-- <div class="col-xl-7 col-lg-7">
             <div class="card shadow mb-4">
                 <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
                     <h6 class="m-0 font-weight-bold text-primary">Grafik Peminjaman VS Pengembalian</h6>
@@ -105,12 +105,35 @@
                         @endforeach
                     </select>
 
-                    <canvas id="ChartAssetStatus" style="max-height: 500px;"></canvas>
+                    <canvas id="ChartAssetStatus" style="max-height: 600px;"></canvas>
                 </div>
 
             </div>
+        </div> --}}
+        <div class="col-xl-7 col-lg-7">
+            <div class="card shadow mb-4" style="max-height: 600px;">
+                <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
+                    <h6 class="m-0 font-weight-bold text-primary">Grafik Peminjaman VS Pengembalian</h6>
+                </div>
+                @php
+                    $chartData = app('App\Http\Controllers\HomeController')->generateChartData();
+                @endphp
+                <div class="card-body" style="height: 80%;"> <!-- Sesuaikan persentase tinggi konten yang diinginkan -->
+                    <label for="yearFilter">Pilih Tahun:</label>
+                    <select id="yearFilter" class="form-control">
+                        @foreach ($chartData['years'] as $year)
+                            @if ($chartData['exitData'][$loop->index] || $chartData['enterData'][$loop->index])
+                                <option value="{{ $year }}">{{ $year }}</option>
+                            @endif
+                        @endforeach
+                    </select>
+
+                    <canvas id="ChartAssetStatus" style="width: 100px; height: 68px;"></canvas>
+                </div>
+            </div>
         </div>
 
+
         <!-- Area Pie Chart -->
         <div class="col-xl-5 col-lg-5">
             <div class="card shadow mb-4">
@@ -118,11 +141,21 @@
                 <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
                     <h6 class="m-0 font-weight-bold text-primary">Grafik Pengadaan Peti</h6>
                 </div>
-                <!-- Card Body -->
+                @php
+                    $chartDataPie = app('App\Http\Controllers\HomeController')->generateChartDataPie();
+                @endphp
+
                 <div class="card-body">
-                    <div class="card-body">
-                        <canvas id="myPieChartsiopas"></canvas>
-                    </div>
+                    <label for="yearFilter">Pilih Tahun:</label>
+                    <select id="yearFilter" class="form-control">
+                        @foreach ($chartDataPie['years'] as $year)
+                            @if (count($chartDataPie['enterData']) > 0 && $chartDataPie['enterData'][$loop->index])
+                                <option value="{{ $year }}">{{ $year }}</option>
+                            @endif
+                        @endforeach
+                    </select>
+
+                    <canvas id="myPieChartsiopas"></canvas>
                 </div>
             </div>
         </div>
@@ -132,41 +165,51 @@
         <!-- script pie chart -->
         <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
         <script>
-            // Sample data for the pie chart
-            var data = {
-                labels: ["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober",
-                    "November", "Desember"
-                ],
-                datasets: [{
-                    data: [30, 40, 30, 25, 35, 45, 20, 30, 40, 50, 30, 20],
-                    backgroundColor: ["#4e73df", "#1cc88a", "#36b9cc", "#ff6384", "#ff9f40", "#9966ff", "#cc65fe",
-                        "#ffcc29", "#a4e56d", "#ff3d00", "#9c9c9c", "#0d47a1"
-                    ],
-                }]
-            };
+            // Function to update the pie chart based on selected year
+            function updatePieChart(selectedYear) {
+                // Call the controller function to get data for the selected year
+                var chartData = {!! json_encode(app('App\Http\Controllers\HomeController')->generateChartDataPie()) !!};
+                var yearIndex = chartData.years.indexOf(selectedYear);
+
+                // Update the pie chart data
+                myPieChart.data.datasets[0].data = chartData.enterData[yearIndex];
+                myPieChart.update();
+            }
+
+            // Initial chart data
+            var initialChartData = {!! json_encode(app('App\Http\Controllers\HomeController')->generateChartDataPie()) !!};
 
             // Get the canvas element for the pie chart
             var ctx = document.getElementById("myPieChartsiopas").getContext('2d');
 
-            // Create the pie chart instance
+            // Create the initial pie chart instance
             var myPieChart = new Chart(ctx, {
                 type: 'pie',
-                data: data,
+                data: {
+                    labels: initialChartData.monthNames,
+                    datasets: [{
+                        data: initialChartData.enterData[0],
+                        backgroundColor: ["#4e73df", "#1cc88a", "#36b9cc", "#ff6384", "#ff9f40", "#9966ff",
+                            "#cc65fe",
+                            "#ffcc29", "#a4e56d", "#ff3d00", "#9c9c9c", "#0d47a1"
+                        ],
+                    }]
+                },
                 options: {
                     responsive: true,
                     plugins: {
                         legend: {
-                            position: 'right', // Set the legend position to the right
-                            maxHeight: 200, // Set a maximum height for the legend
+                            position: 'right',
+                            maxHeight: 200,
                         },
                         tooltip: {
                             callbacks: {
                                 label: function(context) {
                                     var label = context.label || '';
                                     if (label) {
-                                        label += ': ';
+                                        label += ' : ';
                                     }
-                                    label += Math.round(context.parsed * 1) + '%';
+                                    label += Math.round(context.parsed * 1) + ' Peti';
                                     return label;
                                 }
                             }
@@ -177,8 +220,15 @@
 
             // Custom legend using legendCallback
             document.getElementById('chart-legend').innerHTML = myPieChart.generateLegend();
+
+            // Event listener for year filter change
+            document.getElementById('yearFilter').addEventListener('change', function() {
+                var selectedYear = this.value;
+                updatePieChart(selectedYear);
+            });
         </script>
 
+
         <!-- script bar chart -->
         <script>
             document.addEventListener('DOMContentLoaded', function() {
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 79369f9..61a4b20 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -64,7 +64,7 @@
         <li class="nav-item">
             <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo"
                 aria-expanded="{{ $isUserActive ? 'true' : 'false' }}" aria-controls="collapseTwo">
-                <i class="fas fa-fw fa-user"></i>
+                <i class="fas fa-fw fa-users"></i>
                 <span>Manajemen User</span>
             </a>
             <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
@@ -78,7 +78,7 @@
         </li>
         <li class="nav-item {{ $active == 'menu-customer' ? 'active' : '' }}">
             <a class="nav-link" href="{{ route('dashboard.customer.index') }}">
-                <i class="fas fa-fw fa-users"></i>
+                <i class="fas fa-fw fa-user"></i>
                 <span>Customer</span>
             </a>
         </li>
@@ -89,7 +89,7 @@
         <li class="nav-item">
             <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsepeti"
                 aria-expanded="{{ $isPetiActive ? 'true' : 'false' }}" aria-controls="collapsepeti">
-                <i class="fas fa-fw fa-user"></i>
+                <i class="fas fa-fw fa-box"></i>
                 <span>Manajemen Peti</span>
             </a>
             <div id="collapsepeti" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
@@ -106,7 +106,7 @@
         </li>
         <li class="nav-item {{ $active == 'menu-warehouse' ? 'active' : '' }}">
             <a class="nav-link" href="{{ route('dashboard.warehouse.index') }}">
-                <i class="fas fa-fw fa-table"></i>
+                <i class="fas fa-fw fa-warehouse"></i>
                 <span>Warehouse</span>
             </a>
         </li>
diff --git a/routes/web.php b/routes/web.php
index c1ed5d2..deeccf9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -85,9 +85,9 @@ Route::prefix('dashboard')->name('dashboard.')->middleware(['auth'])->group(func
         Route::get('disposal', 'index')->name('disposal.index');
         Route::get('disposal/create', 'create')->name('disposal.create');
         Route::post('disposal/store', 'store')->name('disposal.store');
-        Route::get('disposal/{id}', 'show')->name('disposal.show');
+        // Route::get('disposal/{id}', 'show')->name('disposal.show');
         Route::get('disposal/{id}/edit', 'edit')->name('disposal.edit');
-        Route::put('disposal/{id}', 'update')->name('disposal.update');
+        // Route::put('disposal/{id}', 'update')->name('disposal.update');
         Route::delete('disposal/delete/{id}', 'destroy')->name('disposal.destroy');
     });
 

From ef4c563141e6b071e125aaaa2f278a8a4a0179e1 Mon Sep 17 00:00:00 2001
From: Gunawan19621 <gunawan19621@gmail.com>
Date: Tue, 21 Nov 2023 13:46:49 +0700
Subject: [PATCH 2/2] Perbaikan disposal, peminjaman dan pengembalian

---
 app/Http/Controllers/CustomerController.php   |   2 +-
 app/Http/Controllers/DisposalController.php   |  56 ++++++++--
 .../Controllers/KondisiPetiController.php     |   2 +-
 app/Http/Controllers/M_userController.php     |   2 +-
 app/Http/Controllers/PeminjamanController.php |  13 ++-
 .../Controllers/PengembalianController.php    |   6 +-
 app/Http/Controllers/PetiController.php       |   2 +-
 .../Controllers/PetternLotPetiController.php  |   1 +
 app/Http/Controllers/RoleController.php       |   2 +-
 app/Http/Controllers/TransferController.php   |   6 +-
 app/Http/Controllers/TypePetiController.php   |   2 +-
 app/Http/Controllers/WarehouseController.php  |   2 +-
 .../Disposal/ValidasiCreateDisposal.php       |   6 +-
 .../Disposal/ValidasiUpdateDisposal.php       |  17 ++-
 .../Requests/ValidasiUpdatePengembalian.php   |   1 +
 app/Models/Disposal.php                       |   3 +-
 app/Models/Transfer.php                       |   1 +
 app/Models/asset_status.php                   |   2 +
 .../2023_11_06_085238_create_petis_table.php  |   1 +
 ..._06_122033_create_asset_statuses_table.php |   3 +
 ...23_11_08_132316_create_transfers_table.php |  11 +-
 ...23_11_17_075418_create_disposals_table.php |   7 +-
 .../views/dashboard/Disposal/create.blade.php |  22 ++--
 .../views/dashboard/Disposal/edit.blade.php   |  27 +++--
 .../views/dashboard/Disposal/index.blade.php  |   4 +-
 .../dashboard/Peminjaman/index.blade.php      |  30 +-----
 .../dashboard/Pengembalian/edit.blade.php     |   2 +-
 .../dashboard/Pengembalian/index.blade.php    | 101 +++++++++---------
 .../views/dashboard/Transfer/create.blade.php |  10 +-
 routes/web.php                                |   2 +-
 30 files changed, 203 insertions(+), 143 deletions(-)

diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index cbb3849..95422cd 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -18,7 +18,7 @@ class CustomerController extends Controller
     public function index()
     {
         $data = [
-            'customer' => Customer::all(),
+            'customer' => Customer::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-customer',
         ];
         return view('dashboard.Master_Data.Customer.index', $data);
diff --git a/app/Http/Controllers/DisposalController.php b/app/Http/Controllers/DisposalController.php
index 7cb9662..6915ba1 100644
--- a/app/Http/Controllers/DisposalController.php
+++ b/app/Http/Controllers/DisposalController.php
@@ -4,18 +4,20 @@ namespace App\Http\Controllers;
 
 use App\Models\Peti;
 use App\Models\Customer;
+use App\Models\Disposal;
 use App\Models\m_warehouse;
 use Illuminate\Http\Request;
+use Symfony\Component\Uid\Uuid;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Requests\Disposal\ValidasiCreateDisposal;
-use App\Models\Disposal;
+use App\Http\Requests\Disposal\ValidasiUpdateDisposal;
 
 class DisposalController extends Controller
 {
     public function index()
     {
         $data = [
-            'disposal' => Disposal::all(),
+            'disposal' => Disposal::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-disposal',
         ];
         return view('dashboard.Disposal.index', $data);
@@ -42,6 +44,7 @@ class DisposalController extends Controller
     public function store(ValidasiCreateDisposal $request)
     {
         // dd($request->all());
+        // dd($request);
         try {
             // Mendapatkan informasi pengguna yang sedang login
             $currentUser = Auth::user();
@@ -50,11 +53,18 @@ class DisposalController extends Controller
             $validatedData = $request->validated();
 
             // Menambahkan informasi pengguna ke dalam data yang akan disimpan
+            $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile
             $validatedData['created_by'] = $currentUser->fullname;
             $validatedData['updated_by'] = $currentUser->fullname;
 
-            // Membuat entitas Transfer
-            Disposal::create($validatedData);
+            // Membuat entitas Disposal
+            $disposal = Disposal::create($validatedData);
+
+            // Mengupdate warehouse_id pada model Peti
+            Peti::where('id', $disposal->peti_id)
+                ->update([
+                    'status' => $disposal->status_disposal,
+                ]);
 
             return redirect()->route('dashboard.disposal.index')->with('success', 'Data Disposal Peti berhasil ditambahkan');
         } catch (\Throwable $th) {
@@ -92,10 +102,40 @@ class DisposalController extends Controller
     /**
      * Update the specified resource in storage.
      */
-    // public function update($request, $id)
-    // {
-    //     //
-    // }
+    public function update(ValidasiUpdateDisposal $request, $id)
+    {
+        // dd("oke");
+        try {
+            // Mendapatkan informasi pengguna yang sedang login
+            $currentUser = Auth::user();
+
+            // Validasi data dari request
+            $validatedData = $request->validated();
+
+            // Menambahkan informasi pengguna ke dalam data yang akan disimpan
+            $validatedData['updated_by'] = $currentUser->fullname;
+
+            // Mencari transfer berdasarkan ID
+            $disposal = Disposal::find($id);
+
+            if (!$disposal) {
+                return redirect()->route('dashboard.disposal.index')->with('error', 'Data Disposal Peti tidak ditemukan');
+            }
+
+            // Memperbarui data transfer
+            $disposal->update($validatedData);
+
+            // Mengupdate warehouse_id pada model Peti
+            Peti::where('id', $disposal->peti_id)
+                ->update([
+                    'status' => $disposal->status_disposal,
+                ]);
+
+            return redirect()->route('dashboard.disposal.index')->with('success', 'Data Disposal Peti berhasil diperbaharui');
+        } catch (\Throwable $th) {
+            return redirect()->back()->with('error', 'Data Disposal Peti gagal diperbaharui');
+        }
+    }
 
     /**
      * Remove the specified resource from storage.
diff --git a/app/Http/Controllers/KondisiPetiController.php b/app/Http/Controllers/KondisiPetiController.php
index bb2e4ff..76a341a 100644
--- a/app/Http/Controllers/KondisiPetiController.php
+++ b/app/Http/Controllers/KondisiPetiController.php
@@ -13,7 +13,7 @@ class KondisiPetiController extends Controller
     public function index()
     {
         $data = [
-            'kondisiPeti' => Kondisi_Peti::all(),
+            'kondisiPeti' => Kondisi_Peti::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-kondisipeti'
         ];
         return view('dashboard.Master_Data.Manajemen_Peti.Kondisi_Peti.index', $data);
diff --git a/app/Http/Controllers/M_userController.php b/app/Http/Controllers/M_userController.php
index 9d39ad3..01ce030 100644
--- a/app/Http/Controllers/M_userController.php
+++ b/app/Http/Controllers/M_userController.php
@@ -17,9 +17,9 @@ class M_userController extends Controller
     public function index()
     {
         $data = [
+            'user' => User::orderBy('created_at', 'desc')->get(),
             'warehouse' => m_warehouse::get(),
             'role' => m_role::get(),
-            'user' => User::get(),
             'active' => 'menu-user',
         ];
         return view('dashboard.Master_Data.User.index', $data);
diff --git a/app/Http/Controllers/PeminjamanController.php b/app/Http/Controllers/PeminjamanController.php
index c5d4e46..64871ec 100644
--- a/app/Http/Controllers/PeminjamanController.php
+++ b/app/Http/Controllers/PeminjamanController.php
@@ -5,12 +5,10 @@ namespace App\Http\Controllers;
 use App\Http\Requests\ValidasiCreatePeminjaman;
 use App\Http\Requests\ValidasiUpdatePeminjaman;
 use App\Models\Peti;
-use App\Models\m_asset;
 use App\Models\m_warehouse;
 use App\Models\asset_status;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use SimpleSoftwareIO\QrCode\Facades\QrCode;
+use Symfony\Component\Uid\Uuid;
 
 class PeminjamanController extends Controller
 {
@@ -22,7 +20,7 @@ class PeminjamanController extends Controller
 
         $data = [
             // 'peminjaman' => asset_status::get(),
-            'peminjaman' => asset_status::get(),
+            'peminjaman' => asset_status::orderBy('created_at', 'desc')->get(),
             'warehouse' => m_warehouse::get(),
             'active' => 'menu-peminjaman',
         ];
@@ -39,7 +37,10 @@ class PeminjamanController extends Controller
             'peti' => Peti::all(),
             'peminjaman' => asset_status::get(),
             'warehouse' => m_warehouse::get(),
-            'peti_block' => Peti::whereNotIn('id', asset_status::pluck('peti_id')->toArray())->get(),
+            'peti_block' => Peti::whereNotIn('id', asset_status::where('status', 0)->pluck('peti_id')->toArray())
+                ->where('status', 'AKTIF') // Sesuaikan dengan nama kolom yang benar
+                ->get(),
+
             'existingPeti' => asset_status::pluck('peti_id')->toArray(),
             'active' => 'menu-peminjaman',
         ];
@@ -56,8 +57,10 @@ class PeminjamanController extends Controller
 
             $validatedData = $request->except('_token');
             $validatedData['exit_pic'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai created_by
+            $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile
             $validatedData['created_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai created_by
             $validatedData['updated_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai updated_by
+
             // dd($validatedData);
             asset_status::create($validatedData);
             return redirect()->route('dashboard.peminjaman.index')->with('success', 'Data peminjaman berhasil ditambah.');
diff --git a/app/Http/Controllers/PengembalianController.php b/app/Http/Controllers/PengembalianController.php
index 3b8f037..0838a58 100644
--- a/app/Http/Controllers/PengembalianController.php
+++ b/app/Http/Controllers/PengembalianController.php
@@ -14,7 +14,7 @@ class PengembalianController extends Controller
     public function index()
     {
         $data = [
-            'peminjaman' => asset_status::all(),
+            'peminjaman' => asset_status::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-pengembalian',
         ];
         return view('dashboard.Pengembalian.index', $data);
@@ -76,7 +76,9 @@ class PengembalianController extends Controller
             $peminjaman->enter_at = $request->input('enter_at');
             $peminjaman->enter_warehouse = $request->input('enter_warehouse');
             $peminjaman->kondisi_peti = $request->input('kondisi_peti');
-
+            // Mengatur status menjadi 0 secara otomatis
+            $peminjaman->status = 0;
+            // dd($peminjaman);
             $peminjaman->save();
 
             return redirect()->route('dashboard.pengembalian.index')->with('success', 'Data peminjaman berhasil diperbaharui');
diff --git a/app/Http/Controllers/PetiController.php b/app/Http/Controllers/PetiController.php
index 47775ea..8b9aaba 100644
--- a/app/Http/Controllers/PetiController.php
+++ b/app/Http/Controllers/PetiController.php
@@ -24,8 +24,8 @@ class PetiController extends Controller
     public function index()
     {
         $data = [
+            'peti' => Peti::orderBy('created_at', 'desc')->get(),
             'kondisiPeti' => Kondisi_Peti::all(),
-            'peti' => Peti::all(),
             'active' => 'menu-peti',
         ];
         return view('dashboard.Master_Data.Manajemen_Peti.Peti.index', $data);
diff --git a/app/Http/Controllers/PetternLotPetiController.php b/app/Http/Controllers/PetternLotPetiController.php
index f273592..852dc76 100644
--- a/app/Http/Controllers/PetternLotPetiController.php
+++ b/app/Http/Controllers/PetternLotPetiController.php
@@ -12,6 +12,7 @@ class PetternLotPetiController extends Controller
     public function index()
     {
         $data = [
+            // 'warehouses' => m_warehouse::orderBy('created_at', 'desc')->get(),
             'peti' => Peti::get(),
             'active' => 'menu-Pettern_Lot_Peti'
         ];
diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index 6532e4a..23362b4 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -16,7 +16,7 @@ class RoleController extends Controller
     public function index()
     {
         $data = [
-            'role' => m_role::all(),
+            'role' => m_role::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-role',
         ];
         return view('dashboard.Master_Data.Role.index', $data);
diff --git a/app/Http/Controllers/TransferController.php b/app/Http/Controllers/TransferController.php
index 6e4b6a3..4c20870 100644
--- a/app/Http/Controllers/TransferController.php
+++ b/app/Http/Controllers/TransferController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Peti;
+use Symfony\Component\Uid\Uuid;
 use App\Models\Customer;
 use App\Models\Transfer;
 use App\Models\m_warehouse;
@@ -16,7 +17,7 @@ class TransferController extends Controller
     public function index()
     {
         $data = [
-            'transfer' => Transfer::all(),
+            'transfer' => Transfer::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-transfer',
         ];
         return view('dashboard.Transfer.index', $data);
@@ -50,12 +51,13 @@ class TransferController extends Controller
             $validatedData = $request->validated();
 
             // Menambahkan informasi pengguna ke dalam data yang akan disimpan
+            $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile
             $validatedData['created_by'] = $currentUser->fullname;
             $validatedData['updated_by'] = $currentUser->fullname;
 
             // Membuat entitas Transfer
             $transfer = Transfer::create($validatedData);
-
+            // dd($transfer);
             // Mengupdate warehouse_id pada model Peti
             Peti::where('id', $transfer->peti_id)
                 ->update([
diff --git a/app/Http/Controllers/TypePetiController.php b/app/Http/Controllers/TypePetiController.php
index 9a2c492..c3045ad 100644
--- a/app/Http/Controllers/TypePetiController.php
+++ b/app/Http/Controllers/TypePetiController.php
@@ -16,7 +16,7 @@ class TypePetiController extends Controller
     public function index()
     {
         $data = [
-            'typepeti' => Type_peti::all(),
+            'typepeti' => Type_peti::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-typepeti',
         ];
         return view('dashboard.Master_Data.Manajemen_Peti.Type_peti.index', $data);
diff --git a/app/Http/Controllers/WarehouseController.php b/app/Http/Controllers/WarehouseController.php
index 580ebd3..0c2697d 100644
--- a/app/Http/Controllers/WarehouseController.php
+++ b/app/Http/Controllers/WarehouseController.php
@@ -16,7 +16,7 @@ class WarehouseController extends Controller
     public function index()
     {
         $data = [
-            'warehouses' => m_warehouse::all(),
+            'warehouses' => m_warehouse::orderBy('created_at', 'desc')->get(),
             'active' => 'menu-warehouse',
         ];
         return view('dashboard.Master_Data.Warehouse.index', $data);
diff --git a/app/Http/Requests/Disposal/ValidasiCreateDisposal.php b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php
index 77429c6..5090760 100644
--- a/app/Http/Requests/Disposal/ValidasiCreateDisposal.php
+++ b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php
@@ -22,12 +22,12 @@ class ValidasiCreateDisposal extends FormRequest
     public function rules(): array
     {
         return [
-            'peti_id' => 'nullable',
+            'peti_id' => 'required',
             'customer_id' => 'nullable',
             'warehouse_id' => 'nullable',
             'date_disposal' => 'nullable|date',
             'description' => 'nullable|string',
-            'jenis_disposal' => 'nullable|string|max:50',
+            'status_disposal' => 'nullable',
         ];
     }
 
@@ -36,8 +36,6 @@ class ValidasiCreateDisposal extends FormRequest
         return [
             'date_disposal.date' => 'Format tanggal disposal tidak valid.',
             'description.string' => 'Deskripsi harus berupa teks.',
-            'jenis_disposal.string' => 'Jenis disposal harus berupa teks.',
-            'jenis_disposal.max' => 'Jenis disposal tidak boleh lebih dari :max karakter.',
         ];
     }
 }
diff --git a/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
index 66e086d..e400920 100644
--- a/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
+++ b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php
@@ -11,7 +11,7 @@ class ValidasiUpdateDisposal extends FormRequest
      */
     public function authorize(): bool
     {
-        return false;
+        return true;
     }
 
     /**
@@ -22,7 +22,20 @@ class ValidasiUpdateDisposal extends FormRequest
     public function rules(): array
     {
         return [
-            //
+            'peti_id' => 'required',
+            'customer_id' => 'nullable',
+            'warehouse_id' => 'nullable',
+            'date_disposal' => 'nullable|date',
+            'description' => 'nullable|string',
+            'status_disposal' => 'nullable',
+        ];
+    }
+
+    public function messages(): array
+    {
+        return [
+            'date_disposal.date' => 'Format tanggal disposal tidak valid.',
+            'description.string' => 'Deskripsi harus berupa teks.',
         ];
     }
 }
diff --git a/app/Http/Requests/ValidasiUpdatePengembalian.php b/app/Http/Requests/ValidasiUpdatePengembalian.php
index aadc956..6183ba7 100644
--- a/app/Http/Requests/ValidasiUpdatePengembalian.php
+++ b/app/Http/Requests/ValidasiUpdatePengembalian.php
@@ -29,6 +29,7 @@ class ValidasiUpdatePengembalian extends FormRequest
             'enter_at' => 'required|date',
             'enter_warehouse' => 'required',
             'kondisi_peti' => 'required|string',
+            'status' => '',
         ];
     }
 
diff --git a/app/Models/Disposal.php b/app/Models/Disposal.php
index bc463cd..966bf75 100644
--- a/app/Models/Disposal.php
+++ b/app/Models/Disposal.php
@@ -13,12 +13,13 @@ class Disposal extends Model
     protected $table = 'disposals';
 
     protected $fillable = [
+        'mobile_id',
         'peti_id',
         'customer_id',
         'date_disposal',
         'warehouse_id',
         'description',
-        'jenis_disposal',
+        'status_disposal',
         'created_by',
         'updated_by',
     ];
diff --git a/app/Models/Transfer.php b/app/Models/Transfer.php
index e063ca7..2372bd2 100644
--- a/app/Models/Transfer.php
+++ b/app/Models/Transfer.php
@@ -14,6 +14,7 @@ class Transfer extends Model
     protected $table = 'transfers';
 
     protected $fillable = [
+        'mobile_id',
         'peti_id',
         'source_warehouse',
         'destination_warehouse',
diff --git a/app/Models/asset_status.php b/app/Models/asset_status.php
index 8b8f121..e5e5a66 100644
--- a/app/Models/asset_status.php
+++ b/app/Models/asset_status.php
@@ -15,6 +15,7 @@ class asset_status extends Model
     protected $table = 'asset_statuses';
 
     protected $fillable = [
+        'mobile_id',
         'peti_id',
         'exit_at',
         'est_pengembalian',
@@ -24,6 +25,7 @@ class asset_status extends Model
         'enter_pic',
         'enter_warehouse',
         'kondisi_peti',
+        'status',
         'created_by',
         'updated_by',
     ];
diff --git a/database/migrations/2023_11_06_085238_create_petis_table.php b/database/migrations/2023_11_06_085238_create_petis_table.php
index e43e795..4532dc4 100644
--- a/database/migrations/2023_11_06_085238_create_petis_table.php
+++ b/database/migrations/2023_11_06_085238_create_petis_table.php
@@ -23,6 +23,7 @@ return new class extends Migration
             $table->date('date_pembuatan', 100)->nullable();
             $table->foreignUuid('warehouse_id')->nullable()->constrained('m_warehouses')->onDelete('set null');
             $table->foreignUuid('kondisipeti_id')->nullable()->constrained('kondisi_petis')->onDelete('set null');
+            $table->string('status', 50)->default('AKTIF');
             $table->timestamps();
             $table->softDeletes();
             $table->string('created_by', 200)->nullable();
diff --git a/database/migrations/2023_11_06_122033_create_asset_statuses_table.php b/database/migrations/2023_11_06_122033_create_asset_statuses_table.php
index 72f42ad..cade79b 100644
--- a/database/migrations/2023_11_06_122033_create_asset_statuses_table.php
+++ b/database/migrations/2023_11_06_122033_create_asset_statuses_table.php
@@ -13,6 +13,7 @@ return new class extends Migration
     {
         Schema::create('asset_statuses', function (Blueprint $table) {
             $table->uuid('id')->primary();
+            $table->uuid('mobile_id')->nullable();
             $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null');
             $table->date('exit_at')->nullable();
             $table->date('est_pengembalian')->nullable();
@@ -22,6 +23,8 @@ return new class extends Migration
             $table->string('enter_pic', 200)->nullable();
             $table->foreignUuid('enter_warehouse')->nullable()->constrained('m_warehouses');
             $table->string('kondisi_peti')->nullable();
+            // $table->string('status')->default('DIPINJAM');
+            $table->boolean('status')->default(1);
             $table->timestamps();
             $table->softDeletes();
             $table->string('created_by', 200)->nullable();
diff --git a/database/migrations/2023_11_08_132316_create_transfers_table.php b/database/migrations/2023_11_08_132316_create_transfers_table.php
index 4cca93b..8409fbc 100644
--- a/database/migrations/2023_11_08_132316_create_transfers_table.php
+++ b/database/migrations/2023_11_08_132316_create_transfers_table.php
@@ -13,11 +13,12 @@ return new class extends Migration
     {
         Schema::create('transfers', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null');
-            $table->foreignUuid('name_customer')->nullable()->constrained('customers');
-            $table->foreignUuid('source_warehouse')->nullable()->constrained('m_warehouses');
-            $table->foreignUuid('destination_warehouse')->nullable()->constrained('m_warehouses');
-            $table->date('date')->nullable();
+            $table->uuid('mobile_id')->nullable();
+            $table->foreignUuid('peti_id')->constrained('petis');
+            $table->foreignUuid('name_customer')->constrained('customers');
+            $table->foreignUuid('source_warehouse')->constrained('m_warehouses');
+            $table->foreignUuid('destination_warehouse')->constrained('m_warehouses');
+            $table->date('date');
             $table->timestamps();
             $table->softDeletes();
             $table->string('created_by', 200)->nullable();
diff --git a/database/migrations/2023_11_17_075418_create_disposals_table.php b/database/migrations/2023_11_17_075418_create_disposals_table.php
index f734f9b..a1e684c 100644
--- a/database/migrations/2023_11_17_075418_create_disposals_table.php
+++ b/database/migrations/2023_11_17_075418_create_disposals_table.php
@@ -13,12 +13,13 @@ return new class extends Migration
     {
         Schema::create('disposals', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null');
+            $table->uuid('mobile_id')->nullable();
+            $table->foreignUuid('peti_id')->constrained('petis');
             $table->foreignUuid('customer_id')->nullable()->constrained('customers');
             $table->foreignUuid('warehouse_id')->nullable()->constrained('m_warehouses');
-            $table->date('date_disposal')->nullable();
+            $table->date('date_disposal');
             $table->text('description')->nullable();
-            $table->string('jenis_disposal', 50)->nullable();
+            $table->string('status_disposal', 50);
             $table->timestamps();
             $table->softDeletes();
             $table->string('created_by', 200)->nullable();
diff --git a/resources/views/dashboard/Disposal/create.blade.php b/resources/views/dashboard/Disposal/create.blade.php
index 5bd4587..f3c63a9 100644
--- a/resources/views/dashboard/Disposal/create.blade.php
+++ b/resources/views/dashboard/Disposal/create.blade.php
@@ -27,7 +27,7 @@
                     </select>
 
                     <label for="customer_id" class="col-form-label">Customer: <span class="text-danger">*</span></label>
-                    <select class="form-control" name="customer_id" type="text" id="customer_id">
+                    <select class="form-control" name="customer_id" type="text" id="customer_id" required>
                         <option disabled selected>Nama Customer akan otomatis terpilih ketika memilih detail peti.</option>
                         @foreach ($customer as $data_customer)
                             <option value="{{ $data_customer->id }}">{{ $data_customer->name }}</option>
@@ -37,27 +37,27 @@
                     <label for="date_disposal" class="col-form-label">Tanggal Disposal: <span
                             class="text-danger">*</span></label>
                     <input class="form-control" name="date_disposal" type="date" id="date_disposal"
-                        value="{{ old('date_disposal') }}">
+                        value="{{ old('date_disposal') }}" required>
 
                     <label for="warehouse_id" class="col-form-label">Asal Gudang: <span class="text-danger">*</span></label>
-                    <select class="form-control" name="warehouse_id" type="text" id="warehouse_id">
+                    <select class="form-control" name="warehouse_id" type="text" id="warehouse_id" required>
                         <option disabled selected>Asal gudang akan otomatis terpilih ketika memilih detail peti.</option>
                         @foreach ($warehouse as $data)
                             <option value="{{ $data->id }}">{{ $data->name }}</option>
                         @endforeach
                     </select>
 
-                    <label for="description" class="col-form-label">Alasan Disposal: <span
+                    <label for="status_disposal" class="col-form-label">Status Peti: <span
                             class="text-danger">*</span></label>
-                    <textarea class="form-control" name="description" id="description" placeholder="Masukan Alasan Disposal" required>{{ old('description') }}</textarea>
+                    <select class="form-control" name="status_disposal" id="status_disposal" required>
+                        <option disabled selected>Pilih Jenis Status Peti</option>
+                        <option value="AKTIF">AKTIF</option>
+                        <option value="INAKTIF">INAKTIF</option>
+                    </select>
 
-                    <label for="jenis_disposal" class="col-form-label">Jenis Disposal: <span
+                    <label for="description" class="col-form-label">Alasan Disposal: <span
                             class="text-danger">*</span></label>
-                    <select class="form-control" name="jenis_disposal" id="jenis_disposal">
-                        <option disabled selected>Pilih Jenis Disposal</option>
-                        <option value="Pemusnaan">Pemusnaan</option>
-                        <option value="Perbaikan">Perbaikan</option>
-                    </select>
+                    <textarea class="form-control" name="description" id="description" placeholder="Masukan Alasan Disposal" required>{{ old('description') }}</textarea>
                 </div>
                 <div class="modal-footer d-flex justify-content-center">
                     <a href="{{ route('dashboard.disposal.index') }}" class="btn btn-secondary">Kembali</a>
diff --git a/resources/views/dashboard/Disposal/edit.blade.php b/resources/views/dashboard/Disposal/edit.blade.php
index fa89605..7b8fd0f 100644
--- a/resources/views/dashboard/Disposal/edit.blade.php
+++ b/resources/views/dashboard/Disposal/edit.blade.php
@@ -11,9 +11,10 @@
             </div>
         </div>
         <div class="card-body">
-            <form action="{{ route('dashboard.disposal.store') }}" method="POST" enctype="multipart/form-data"
+            <form action="{{ route('dashboard.disposal.update', $disposal->id) }}" method="POST" enctype="multipart/form-data"
                 id="disposalForm">
                 @csrf
+                @method('PUT')
                 <div class="form-group">
                     <label for="peti_id" class="col-form-label">Pilih Detail Peti: <span
                             class="text-danger">*</span></label>
@@ -44,10 +45,6 @@
                     <input class="form-control" name="date_disposal" type="date" id="date_disposal"
                         value="{{ $disposal->date_disposal }}">
 
-
-
-
-
                     <label for="warehouse_id" class="col-form-label">Asal Gudang: <span class="text-danger">*</span></label>
                     <select class="form-control" name="warehouse_id" type="text" id="warehouse_id" required>
                         <option disabled selected>Pilih Asal gudang</option>
@@ -63,13 +60,23 @@
                             class="text-danger">*</span></label>
                     <textarea class="form-control" name="description" id="description" placeholder="Masukan Alasan Disposal" required>{{ $disposal->description }}</textarea>
 
-                    <label for="jenis_disposal" class="col-form-label">Jenis Disposal: <span
+                    {{-- <label for="status_disposal" class="col-form-label">Status Peti: <span
+                            class="text-danger">*</span></label>
+                    <select class="form-control" name="status_disposal" id="status_disposal">
+                        <option disabled selected>Pilih Jenis Status Peti</option>
+                        <option value="AKTIF">AKTIF</option>
+                        <option value="INAKTIF">INAKTIF</option>
+                    </select> --}}
+                    <label for="status_disposal" class="col-form-label">Status Peti: <span
                             class="text-danger">*</span></label>
-                    <select class="form-control" name="jenis_disposal" id="jenis_disposal">
-                        <option disabled selected>Pilih Jenis Disposal</option>
-                        <option value="Pemusnaan">Pemusnaan</option>
-                        <option value="Perbaikan">Perbaikan</option>
+                    <select class="form-control" name="status_disposal" id="status_disposal">
+                        <option disabled>Pilih Jenis Status Peti</option>
+                        <option value="AKTIF" {{ $disposal->status_disposal === 'AKTIF' ? 'selected' : '' }}>AKTIF
+                        </option>
+                        <option value="INAKTIF" {{ $disposal->status_disposal === 'INAKTIF' ? 'selected' : '' }}>INAKTIF
+                        </option>
                     </select>
+
                 </div>
                 <div class="modal-footer d-flex justify-content-center">
                     <a href="{{ route('dashboard.disposal.index') }}" class="btn btn-secondary">Kembali</a>
diff --git a/resources/views/dashboard/Disposal/index.blade.php b/resources/views/dashboard/Disposal/index.blade.php
index 01a3b49..50686ca 100644
--- a/resources/views/dashboard/Disposal/index.blade.php
+++ b/resources/views/dashboard/Disposal/index.blade.php
@@ -71,7 +71,7 @@
                             <th>Nama Customer</th>
                             <th>Tanggal Disposal</th>
                             <th>Alasan Disposal</th>
-                            <th>Jenis Disposal</th>
+                            <th>Status Peti</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
@@ -86,7 +86,7 @@
                                 <td>{{ $data_disposal->customer->name }}</td>
                                 <td>{{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d/m/Y') }}</td>
                                 <td>{{ $data_disposal->description }}</td>
-                                <td>{{ $data_disposal->jenis_disposal }}</td>
+                                <td>{{ $data_disposal->status_disposal }}</td>
                                 <td class="text-center">
                                     <a href="{{ route('dashboard.disposal.edit', $data_disposal->id) }}" title="Edit">
                                         <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
diff --git a/resources/views/dashboard/Peminjaman/index.blade.php b/resources/views/dashboard/Peminjaman/index.blade.php
index ff15e53..8579a8a 100644
--- a/resources/views/dashboard/Peminjaman/index.blade.php
+++ b/resources/views/dashboard/Peminjaman/index.blade.php
@@ -57,6 +57,10 @@
                                         <td>{{ $data_peminjaman->exit_pic }}</td>
                                         <td>{{ $data_peminjaman->warehouse->name }}</td>
                                         <td class="text-center">
+                                            <a href="{{ route('dashboard.pengembalian.edit', $data_peminjaman->id) }}"
+                                                title="Pengembalian">
+                                                <i class="fa fa-reply mr-2" style="font-size: 20px"></i>
+                                            </a>
                                             <a href="{{ route('dashboard.peminjaman.edit', $data_peminjaman->id) }}"
                                                 title="Edit">
                                                 <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
@@ -75,32 +79,6 @@
                                         </td>
                                     </tr>
                                 @endif
-                                {{-- <tr>
-                                    <td class="text-center">{{ $no_peminjaman++ }}</td>
-                                    <td>{{ $data_peminjaman->peti->fix_lot }}</td>
-                                    <td>{{ $data_peminjaman->peti->customer->name }}</td>
-                                    <td>{{ $data_peminjaman->peti->customer->code_customer }} -
-                                        {{ $data_peminjaman->peti->tipe_peti->type }}</td>
-                                    <td>{{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }}</td>
-                                    <td>{{ $data_peminjaman->exit_pic }}</td>
-                                    <td>{{ $data_peminjaman->warehouse->name }}</td>
-                                    <td class="text-center">
-                                        <a href="{{ route('dashboard.peminjaman.edit', $data_peminjaman->id) }}"
-                                            title="Edit">
-                                            <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
-                                        </a>
-                                        <form action="{{ route('dashboard.peminjaman.destroy', $data_peminjaman->id) }}"
-                                            method="POST" style="display: inline;">
-                                            @csrf
-                                            @method('DELETE')
-                                            <button type="submit"
-                                                onclick="return confirm('Apakah Anda yakin ingin menghapus data ini?')"
-                                                title="Delete" style="border: none; background: none; cursor: pointer;">
-                                                <i class="fa fa-trash text-danger" style="font-size: 20px"></i>
-                                            </button>
-                                        </form>
-                                    </td>
-                                </tr> --}}
                             @empty
                                 <p>Data Kosong</p>
                             @endforelse
diff --git a/resources/views/dashboard/Pengembalian/edit.blade.php b/resources/views/dashboard/Pengembalian/edit.blade.php
index 0c74c17..6f5bbed 100644
--- a/resources/views/dashboard/Pengembalian/edit.blade.php
+++ b/resources/views/dashboard/Pengembalian/edit.blade.php
@@ -62,7 +62,7 @@
                         pattern="[^0-9]+" oninput="this.value=this.value.replace(/[0-9]/g,'');" required>
                 </div>
                 <div class="modal-footer d-flex justify-content-center">
-                    <a href="{{ route('dashboard.pengembalian.index') }}" class="btn btn-secondary">Kembali</a>
+                    <a href="{{ route('dashboard.peminjaman.index') }}" class="btn btn-secondary">Kembali</a>
                     <button type="submit" class="btn btn-primary" id="submitButton">Simpan</button>
                 </div>
             </form>
diff --git a/resources/views/dashboard/Pengembalian/index.blade.php b/resources/views/dashboard/Pengembalian/index.blade.php
index 42f8f04..f4a7797 100644
--- a/resources/views/dashboard/Pengembalian/index.blade.php
+++ b/resources/views/dashboard/Pengembalian/index.blade.php
@@ -40,55 +40,58 @@
                                 $no_peminjaman = 1;
                             @endphp
                             @forelse ($peminjaman as $data)
-                                <tr>
-                                    <td>{{ $no_peminjaman++ }}</td>
-                                    <td>{{ $data->peti->fix_lot }}</td>
-                                    <td>{{ $data->peti->customer->name }}</td>
-                                    <td>{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }}</td>
-                                    <td>{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }}</td>
-                                    <td>{{ $data->exit_pic }}</td>
-                                    <td>{{ $data->warehouse->name }}</td>
-                                    <td>
-                                        @if ($data->enter_at)
-                                            {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
-                                        @else
-                                            <p class="text-center font-weight-bold">-</p>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if ($data->enter_pic)
-                                            {{ $data->enter_pic }}
-                                        @else
-                                            <p class="text-center font-weight-bold">-</p>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if ($data->enter_warehouse)
-                                            {{ $data->warehouse->name }}
-                                        @else
-                                            <p class="text-center font-weight-bold">-</p>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if ($data->kondisi_peti)
-                                            {{ $data->kondisi_peti }}
-                                        @else
-                                            <p class="text-center font-weight-bold">-</p>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if ($data->enter_warehouse === null)
-                                            Not Return
-                                        @else
-                                            Return
-                                        @endif
-                                    </td>
-                                    <td class="text-center">
-                                        <a href="{{ route('dashboard.pengembalian.edit', [$data->id]) }}" title="Edit">
-                                            <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
-                                        </a>
-                                    </td>
-                                </tr>
+                                @if ($data->enter_warehouse !== null)
+                                    <tr>
+                                        <td>{{ $no_peminjaman++ }}</td>
+                                        <td>{{ $data->peti->fix_lot }}</td>
+                                        <td>{{ $data->peti->customer->name }}</td>
+                                        <td>{{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }}</td>
+                                        <td>{{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }}</td>
+                                        <td>{{ $data->exit_pic }}</td>
+                                        <td>{{ $data->warehouse->name }}</td>
+                                        <td>
+                                            @if ($data->enter_at)
+                                                {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }}
+                                            @else
+                                                <p class="text-center font-weight-bold">-</p>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if ($data->enter_pic)
+                                                {{ $data->enter_pic }}
+                                            @else
+                                                <p class="text-center font-weight-bold">-</p>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if ($data->enter_warehouse)
+                                                {{ $data->warehouse->name }}
+                                            @else
+                                                <p class="text-center font-weight-bold">-</p>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if ($data->kondisi_peti)
+                                                {{ $data->kondisi_peti }}
+                                            @else
+                                                <p class="text-center font-weight-bold">-</p>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if ($data->enter_warehouse === null)
+                                                Not Return
+                                            @else
+                                                Return
+                                            @endif
+                                        </td>
+                                        <td class="text-center">
+                                            <a href="{{ route('dashboard.pengembalian.edit', [$data->id]) }}"
+                                                title="Edit">
+                                                <i class="fa fa-edit mr-2" style="font-size: 20px"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                @endif
                             @empty
                                 <p>Data Kosong</p>
                             @endforelse
diff --git a/resources/views/dashboard/Transfer/create.blade.php b/resources/views/dashboard/Transfer/create.blade.php
index b56530b..78fb6cf 100644
--- a/resources/views/dashboard/Transfer/create.blade.php
+++ b/resources/views/dashboard/Transfer/create.blade.php
@@ -28,10 +28,11 @@
 
                     <label for="date" class="col-form-label">Tanggal Transfer: <span
                             class="text-danger">*</span></label>
-                    <input class="form-control" name="date" type="date" id="date" value="{{ old('date') }}">
+                    <input class="form-control" name="date" type="date" id="date" value="{{ old('date') }}"
+                        required>
 
                     <label for="name_customer" class="col-form-label">Customer: <span class="text-danger">*</span></label>
-                    <select class="form-control" name="name_customer" type="text" id="name_customer">
+                    <select class="form-control" name="name_customer" type="text" id="name_customer" required>
                         <option disabled selected>Nama Customer akan otomatis terpilih ketika memilih detail peti.</option>
                         @foreach ($customer as $data_customer)
                             <option value="{{ $data_customer->id }}">{{ $data_customer->name }}</option>
@@ -40,15 +41,16 @@
 
                     <label for="source_warehouse" class="col-form-label">Asal Gudang: <span
                             class="text-danger">*</span></label>
-                    <select class="form-control" name="source_warehouse" type="text" id="source_warehouse" disabled>
+                    <select class="form-control" name="source_warehouse" type="text" id="source_warehouse" required>
                         <option disabled selected>Asal gudang akan otomatis terpilih ketika memilih detail peti.</option>
                         @foreach ($warehouse as $data)
                             <option value="{{ $data->id }}">{{ $data->name }}</option>
                         @endforeach
                     </select>
+
                     <label for="destination_warehouse" class="col-form-label">Tujuan Gudang: <span
                             class="text-danger">*</span></label>
-                    <select class="form-control" name="destination_warehouse" type="text">
+                    <select class="form-control" name="destination_warehouse" type="text" required>
                         <option disabled selected>Pilih Tujuan Gudang</option>
                         @foreach ($warehouse as $data)
                             <option value="{{ $data->id }}">{{ $data->name }}</option>
diff --git a/routes/web.php b/routes/web.php
index deeccf9..9c60812 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -87,7 +87,7 @@ Route::prefix('dashboard')->name('dashboard.')->middleware(['auth'])->group(func
         Route::post('disposal/store', 'store')->name('disposal.store');
         // Route::get('disposal/{id}', 'show')->name('disposal.show');
         Route::get('disposal/{id}/edit', 'edit')->name('disposal.edit');
-        // Route::put('disposal/{id}', 'update')->name('disposal.update');
+        Route::put('disposal/{id}', 'update')->name('disposal.update');
         Route::delete('disposal/delete/{id}', 'destroy')->name('disposal.destroy');
     });