update

app/Helpers/custom.php

@@ -410,6 +410,7 @@ if (!function_exists('valueUnitKonversion')) {
         $value = UnitKonversi::where('kategori_id',$kategori)
             ->where('from_id',$from)
             ->where('to_id',$to)
+            ->orderBy('UnitKonversiId','ASC')
             ->first();
 
         return $value->value;

app/Http/Controllers/Pengaturan/SumberDataEFController.php

@@ -4,15 +4,73 @@ namespace App\Http\Controllers\Pengaturan;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use App\Models\SumberDataEF;
 
 class SumberDataEFController extends Controller
 {
+    protected $title = 'Sumber Data EF';
+    protected $template = 'modules.pengaturan.sumberdata-ef';
+    protected $route = 'modules.pengaturan.sumberdata-ef';
+
     /**
      * Display a listing of the resource.
      */
     public function index()
     {
-        //
+        permission('is_read', $this->route, 'module',true);
+        
+        $data['breadcrumbs'] = [
+            ['name' => 'Dashboard'],
+            ['name' => 'Pengaturan'],
+            ['name' => 'AR','active' => true],
+        ];
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;
+        return view($this->template.'.index',$data);
+    }
+
+    public function grid(Request $request)
+    {
+
+        $data = SumberDataEF::orderBy('nomor_baris','ASC')->get();
+        $_data = [];
+
+
+        foreach ($data as $key => $row) {
+
+
+            $action = '';
+            $status = '';
+            if($row->status == 0){
+                $status = '<span class="btn btn-sm btn-block btn-danger"> Tidak Aktif </span>';
+            }else{
+                $status = '<span class="btn btn-sm btn-block btn-success"> Aktif </span>';
+            }
+            $action .= '<div class="d-flex gap-1">';
+            if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
+                $action .= '<a data-id="'.encode_id($row->SumberDataId).'" href="'.url('pengaturan/sumberdata-ef/update/'.encode_id($row->SumberDataId)).'" data-toggle="tooltip" title="Edit Data" class="btn btn-sm btn-block btn-primary"><i class="mdi mdi-pencil text-white"></i></a>';
+                if(session('group_id') == 1){
+                    $action .= '<a href="#" data-href="'.url('pengaturan/sumberdata-ef/delete/'.encode_id($row->SumberDataId)).'" data-toggle="tooltip" title="Edit Data" class="remove_data btn btn-sm btn-block btn-danger"><i class="mdi mdi-delete text-white"></i></a>';
+                }
+            }
+            $action .= '</div>';
+            
+           $_data[] = [
+                'no'                => $key+1,
+                'id'                => encode_id($row->SumberDataId),
+                'kode'              => @$row->kode,
+                'nama'              => @$row->nama,
+                'deskripsi'         => @$row->deskripsi,
+                'nomor_baris'       => @$row->nomor_baris,
+                'status'            => @$status,
+                'action'            => @$action,
+        ];
+
+        }
+
+        // return response()->json($_data);  // Return the data as a JSON response
+        return response()->json($_data);
+
     }
 
     /**
@@ -28,7 +86,52 @@ class SumberDataEFController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $request->validate([
+            'kode'          => 'required|string|max:255|unique:p_sumberdata_ef,kode',
+            'nama'          => 'required|string|max:255',
+            'deskripsi'     => 'required|string',
+            'nomor_baris'   => 'required|numeric',
+        ],[
+            'kode.unique' => 'Kode Tidak Boleh Sama',
+            'nomor_baris.numeric' => 'Nomor Baris Harus Berupa Angka',
+
+            'kode.required' => 'Tidak Boleh Kosong',
+            'nama.required' => 'Tidak Boleh Kosong',
+            'deskripsi.required' => 'Tidak Boleh Kosong',
+            'nomor_baris.required' => 'Tidak Boleh Kosong',
+        ]);
+
+        try {
+            if(@request()->secure_id){
+                $keyId = decode_id(@request()->secure_id);
+                $data = SumberDataEF::find($keyId);
+                $data->kode          = $request->kode;
+                $data->nama          = $request->nama;
+                $data->deskripsi     = $request->deskripsi;
+                $data->nomor_baris   = $request->nomor_baris;
+                $data->status   = $request->status;
+                $data->save();
+            }else{
+                $data = new SumberDataEF;
+                $data->kode          = $request->kode;
+                $data->nama          = $request->nama;
+                $data->deskripsi     = $request->deskripsi;
+                $data->nomor_baris   = $request->nomor_baris;
+                $data->status   = $request->status;
+                $data->save();
+            }
+            
+
+            return redirect()->back()->with([
+                'message' => 'Berhasil update data',
+                'type'    => 'success',
+            ]);
+        } catch (\Exception $e) {
+            return redirect()->back()->with([
+                'message' => 'Gagal disimpan. Silakan coba lagi. Error: ' . $e->getMessage(),
+                'type'    => 'error',
+            ]);
+        }
     }
 
     /**
@@ -50,9 +153,28 @@ class SumberDataEFController extends Controller
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, string $id)
+    public function update($id = null)
     {
-        //
+        $data['breadcrumbs'] = [
+            ['name' => 'Dashboard'],
+            ['name' => 'Pengaturan'],
+            ['name' => 'AR','active' => true],
+        ];
+        $keyId = decode_id($id);
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;
+        $data['keyId'] = $id;
+        $data['item'] = SumberDataEF::where('SumberDataId',$keyId)->first();
+        return view($this->template.'.form',$data);
+    }
+
+    public function delete($id)
+    {
+        $keyId = decode_id($id);
+
+        $data = SumberDataEF::where('SumberDataId',$keyId)->delete();
+
+        return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']);
     }
 
     /**

app/Http/Controllers/Pengaturan/UnitKonversiController.php

@@ -33,14 +33,7 @@ class UnitKonversiController extends Controller
         $data['unit'] = Unit::where('kategori_id',decode_id(@request()->kategori_id))->get();
         return view($this->template.'.index',$data);
     }
-
+    
-    function valueKonversion($kategori,$from,$to) {
-        $value = valueUnitKonversion(decode_id($kategori),decode_id($from),decode_id($to));
-        // return ;
-
-        return response()->json(['value' => $value]);
-    }
-
     public function grid(Request $request)
     {
         if(@$request->kategori_id){
@@ -53,6 +46,11 @@ class UnitKonversiController extends Controller
 
         foreach ($data as $key => $row) {
 
+            //unit to
+            foreach ($data as $keyAr => $rowAr) {
+                $_ardata['input_'.$rowAr->UnitId.'_'.strtolower($rowAr->kode)] = '<input name="val_'.$row->UnitId.'_'.$rowAr->UnitId.'" type="text" value="'.@valueUnitKonversion($row->kategori->KategoriId,$row->UnitId,$rowAr->UnitId).'" class="form-control">';
+            }
+
 
             $action = '';
             $status = '';
@@ -63,7 +61,9 @@ class UnitKonversiController extends Controller
             }
             $unit = Unit::where('kode',$row->kode)->first();
 
-            $input = '<div class="append"></div>';
+            // $input = '<div class="append"></div>';
+            // $input = '';
+            // $input .= '<input type="text" value="0" class="form-control" name="val_'.@$unit->UnitId.'[]">';
         
             $action .= '<div class="d-flex gap-1">';
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
@@ -74,18 +74,18 @@ class UnitKonversiController extends Controller
                 }
             }
             $action .= '</div>';
-            
+
-           $_data[] = [
+            $_data[] = array_merge([
                 'no'        => $key+1,
                 'id'        => encode_id($row->UnitId),
                 'kategori'  => @$row->kategori->nama,
                 'nama'      => @$row->nama,
-                'kategoriID' => encode_id(@$row->kategori->KategoriId),
+                'kategoriID' => @$row->kategori->KategoriId,
-                'UnitId'    => encode_id($unit->UnitId),
+                'UnitId'    => $unit->UnitId,
                 'status'    => @$status,
                 'input'     => @$input,
                 'action'    => @$action,
-        ];
+            ],$_ardata);
 
         }
 
@@ -108,32 +108,34 @@ class UnitKonversiController extends Controller
     public function store(Request $request)
     {
         $kategoriId = decode_id($request->kategori_id);
-        $toRaw = array_values($request->input('to'));
-        $codes = array_values(array_filter($toRaw, fn($v) => !is_numeric($v)));
-        $codeToId = !empty($codes) ? Unit::whereIn('kode', $codes)->pluck('UnitId','kode')->toArray() : [];
-        $toIds = array_map(fn($v) => is_numeric($v) ? (int)$v : ($codeToId[$v] ?? null), $toRaw);
 
-        DB::transaction(function() use ($request, $kategoriId, $toIds) {
+        foreach ($request->all() as $key => $value) {
-            foreach ($request->all() as $key => $vals) {
+            // pastikan key diawali "val_"
-                if (!str_starts_with($key, 'val_')) continue;
+            if (!str_starts_with($key, 'val_')) {
-
+                continue;
-                $fromId = (int) substr($key, 4);
-                if (!$fromId || !is_array($vals)) continue;
-
-                foreach ($toIds as $col => $toId) {
-                    if (!$toId) continue;
-
-                    $raw = $vals[$col] ?? null;
-                    // skip empty if you want: if ($raw === null || $raw === '') continue;
-                    $value = ($raw === null || $raw === '') ? 0 : (float)$raw;
-
-                    UnitKonversi::updateOrCreate(
-                        ['kategori_id' => $kategoriId, 'from_id' => $fromId, 'to_id' => $toId],
-                        ['value' => $value, 'updated_at' => now()]
-                    );
-                }
             }
-        });
+
+            // pecah: "val_6_17" -> ["val", "6", "17"]
+            $parts = explode('_', $key);
+
+            // jaga-jaga kalau format gak sesuai
+            if (count($parts) !== 3) {
+                continue;
+            }
+
+            $fromId = (int) $parts[1];
+            $toId   = (int) $parts[2];
+
+            // skip kalau value kosong (opsional)
+            if ($value === null || $value === '') {
+                continue;
+            }
+
+            UnitKonversi::updateOrCreate(
+                ['kategori_id' => $kategoriId, 'from_id' => $fromId, 'to_id' => $toId],
+                ['value' => $value, 'updated_at' => now()]
+            );
+        }
 
         return redirect()->back()->with([
                 'message' => 'Berhasil update data',

app/Models/SumberDataEF.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SumberDataEF extends Model
+{
+    protected $table = 'p_sumberdata_ef';
+    protected $primaryKey = 'SumberDataId';
+    protected $guarded = [];
+}

database/migrations/2025_12_10_075141_create_sumber_data_e_f_s_table.php

@@ -0,0 +1,33 @@
+<?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('p_sumberdata_ef', function (Blueprint $table) {
+            $table->id('SumberDataId');
+            $table->string('kode')->nullable();
+            $table->string('nama')->nullable();
+            $table->integer('nomor_baris');
+            $table->text('deskripsi')->nullable();
+            $table->integer('status')->default(0);
+            $table->timestampsTz();
+            $table->softdeletesTz();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('p_sumberdata_ef');
+    }
+};

resources/views/modules/pengaturan/ar/form.blade.php

@@ -97,24 +97,4 @@
 </div>
 @endsection
 @section('js')
-	<script type="text/javascript">
-     $(document).ready(function() {
-            $('.numberInput').on('input', function() {
-                this.value = this.value.replace(/[^0-9]/g, ''); // Hanya angka 0-9
-            });
-            $('#togglePassword').on('click', function() {
-                let passwordField = $('#password');
-                let icon = $(this).find('i');
-
-                // Cek apakah input saat ini bertipe password
-                if (passwordField.attr('type') === 'password') {
-                    passwordField.attr('type', 'text'); // Ubah ke teks
-                    icon.removeClass('mdi-eye').addClass('mdi-eye-off'); // Ganti ikon
-                } else {
-                    passwordField.attr('type', 'password'); // Ubah ke password
-                    icon.removeClass('mdi-eye-off').addClass('mdi-eye'); // Kembalikan ikon
-                }
-            });
-        });   
-    </script>
 @endsection

resources/views/modules/pengaturan/sumberdata-ef/form.blade.php

@@ -0,0 +1,100 @@
+@extends('layouts.master')
+@section('content')
+<div class="page-content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="card">
+                    <div class="card-header">
+                        <i class="mdi mdi-account"></i> {{$title}}
+                    </div>
+                    <form action="{{route($route.'.store')}}" method="POST" class="">
+                    {{csrf_field()}}
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <input type="hidden" name="secure_id" value="{{@$keyId}}">
+                            </div>
+
+                            <div class="col-12 mb-3">
+                                <div class="form-group">
+                                    <label class="col-xl-12 form-label">Kode</label>
+                                    <div class="col-12 ">
+                                        <input type="text" value="{{@$item->kode ? @$item->kode :  old('kode')}}" name="kode" class="form-control @error('kode') is-invalid @enderror" placeholder="Masukan Kode" required>
+                                        @error('kode')
+                                        <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+                            
+                            <div class="col-12 mb-3">
+                                <div class="form-group">
+                                    <label class="col-xl-12 form-label">Nama</label>
+                                    <div class="col-12 ">
+                                        <input type="text" value="{{@$item->nama ? @$item->nama :  old('nama')}}" name="nama"  class="form-control @error('nama') is-invalid @enderror" placeholder="Masukan Nama" required>
+                                        @error('nama')
+                                        <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-12 mb-3">
+                                <div class="form-group">
+                                    <label class="col-xl-12 form-label">Deskripsi</label>
+                                    <div class="col-12 ">
+                                        <textarea name="deskripsi" class="form-control @error('deskripsi') is-invalid @enderror" placeholder="Masukan deskripsi" required id="" cols="30" rows="10">{{@$item->deskripsi ? @$item->deskripsi :  old('deskripsi')}}</textarea>
+                                        @error('deskripsi')
+                                        <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-12 mb-3">
+                                <div class="form-group">
+                                    <label class="col-xl-12 form-label">Nomor Baris</label>
+                                    <div class="col-12 ">
+                                        <input type="text" value="{{@$item->nomor_baris ? @$item->nomor_baris :  old('nomor_baris')}}" name="nomor_baris"  class="form-control @error('nomor_baris') is-invalid @enderror" placeholder="Masukan Nomor Baris" required>
+                                        @error('nomor_baris')
+                                        <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-12 mb-3">
+                                <div class="form-group">
+                                    <label class="col-xl-12 form-label">Status</label>
+                                    <div class="col-12 ">
+                                        <select name="status" class="form-control @error('status') is-invalid @enderror" id="" required>
+                                            <option {{ @$item->status == '0' ? 'selected' : ''}} value="0">Tidak Aktif</option>
+                                            <option {{ @$item->status == '1' ? 'selected' : ''}} value="1">Aktif</option>
+                                        </select>
+                                        @error('status')
+                                        <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+                            
+                        </div>
+                    </div>
+                    <div class="card-footer">
+                        <div class="row">
+                            <div class="col-md-12 text-right">
+                                <a href="{{route($route.'.index')}}" class="btn btn-danger"><i class="mdi mdi-cancel"></i> Batal</a>
+                                <button type="submit" class="btn btn-success"><i class="mdi mdi-content-save-outline"></i> Simpan</button>
+                            </div>
+                        </div>
+                    </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@section('js')
+@endsection

resources/views/modules/pengaturan/sumberdata-ef/index.blade.php

@@ -0,0 +1,93 @@
+@extends('layouts.master')
+
+@section('css')
+@endsection
+@section('content')
+<div class="page-content">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="card">
+                    <div class="card-body">
+                        <div id="toolbar">
+                            <a href="{{route($route.'.update')}}" id="btn-add" class="btn btn-primary">
+                                <i class="mdi mdi-plus"></i> Tambah Data
+                            </a>
+                        </div>
+
+                        <table class="table w-100" 
+                        data-search="true"
+                        data-toggle="table"
+                        data-pagination="true"
+                        data-toolbar="#toolbar"
+                        data-show-refresh="false"
+                        data-url="{{route($route.'.grid')}}"
+                        data-ajax-options='{"xhrFields": {"withCredentials": true}}'
+                        data-sort-name="ids"
+                        data-sort-order="desc"
+                        data-page-size="10"
+                        data-id-field="id"
+                        id="grid-data">
+                            <thead class="table-secondary text-primary">
+                            <tr>
+                                <th data-width="15%" class="text-center" data-field="action">#</th>
+                                <th data-field="kode">Kode</th>
+                                <th data-field="nama">Nama</th>
+                                <th data-field="nomor_baris">Nomor Baris</th>
+                                <th data-field="status">Status</th>
+                            </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@section('js')
+<script type="text/javascript">
+$("#grid-data").on("click", ".remove_data", function() {
+        var base_url = $(this).attr('data-href');
+        var id = $(this).attr('data-id');
+            Swal.fire({
+            title: "Hapus Data!",
+            text: "Apa anda yakin ingin menghapus data ini ?",
+            icon: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Ya Hapus Sekarang",
+            cancelButtonText: "Tidak"
+        }).then((result) => {
+
+            if (result.isConfirmed) {
+
+                request = $.ajax({
+                    url: base_url,
+                    xhrFields: {
+                        withCredentials: true
+                    },
+                    type: "GET",
+                });
+
+                // Callback handler that will be called on success
+                request.done(function(response, textStatus, jqXHR){
+                    console.log(response);
+                    alertify.success("Berhasil Menhapus Data");
+                    $('#grid-data').bootstrapTable('refresh');
+                });
+
+                // Callback handler that will be called on failure
+                request.fail(function (jqXHR, textStatus, errorThrown){
+                    alertify.error("Gagal " + textStatus, errorThrown);
+                });
+
+            }
+
+        });
+
+    return false;
+});
+</script>
+@endsection

resources/views/modules/pengaturan/unit-conversion/index.blade.php

@@ -47,9 +47,8 @@
                                     {{-- <th data-width="15%" class="text-center" data-field="action">#</th> --}}
                                     <th data-field="nama">Nama</th>
                                     @foreach ($unit as $dataUnit)
-                                        <th class="commandInput" data-field="input" data-key="{{ encode_id($dataUnit->UnitId) }}" data-formatter="commandInput">
+                                        <th class="commandInput" data-field="input_{{ $dataUnit->UnitId }}_{{ strtolower($dataUnit->kode) }}" data-key="{{ $dataUnit->UnitId }}">
                                             {{ $dataUnit->kode }}
-                                            <input type="hidden" id="to" data-key="{{ encode_id($dataUnit->UnitId) }}" value="{{ $dataUnit->kode }}" name="to[]">
                                         </th>
                                     @endforeach
                                 </tr>
@@ -97,23 +96,6 @@ function ajaxRequest(params) {
     })
 }
 
-        function commandInput(value, row) {
-            var kategoriID = row['kategoriID'];
-            var unitID     = row['UnitId'];
-            var to         = $('.commandInput').attr('data-key');
-            var key        = "{{ url('pengaturan/unit-conversion/value') }}/"+kategoriID + '/' + unitID + '/' + to;
-            var input      = '';
-            var val        = 0;
-
-            $.get(key, function(res){
-                val = res.value;
-            });
-
-            input += '<input type="text" value="'+val+'" name="val_'+row['UnitId']+'[]" class="form-control">';
-            
-            return input;
-        }
-
 $("#grid-data").on("click", ".remove_data", function() {
         var base_url = $(this).attr('data-href');
         var id = $(this).attr('data-id');

routes/modules/modules.php

@@ -15,15 +15,22 @@ use App\Http\Controllers\Pengaturan\GWPController;
 use App\Http\Controllers\Pengaturan\KategoriController;
 use App\Http\Controllers\Pengaturan\UnitController;
 use App\Http\Controllers\Pengaturan\UnitKonversiController;
+use App\Http\Controllers\Pengaturan\SumberDataEFController;
 
 Route::get('dashboard',[HomeController::class,'index'])->name('index');
 
 Route::name('pengaturan.')->prefix('pengaturan')->group(function () {
 
+    Route::name('sumberdata-ef.')->prefix('sumberdata-ef')->group(function () {
+        Route::resource('/',SumberDataEFController::class);
+        Route::get('grid',[SumberDataEFController::class,'grid'])->name('grid');
+        Route::get('update/{id?}',[SumberDataEFController::class,'update'])->name('update');
+        Route::get('delete/{id?}',[SumberDataEFController::class,'delete'])->name('delete');
+    });
+
     Route::name('unit-conversion.')->prefix('unit-conversion')->group(function () {
         Route::resource('/',UnitKonversiController::class);
         Route::get('grid',[UnitKonversiController::class,'grid'])->name('grid');
-        Route::get('value/{kategori}/{from}/{to}',[UnitKonversiController::class,'valueKonversion'])->name('valueKonversion');
         Route::get('update/{id?}',[UnitKonversiController::class,'update'])->name('update');
         Route::get('delete/{id?}',[UnitKonversiController::class,'delete'])->name('delete');
     });