diff --git a/app/Http/Controllers/Pengaturan/UploadAktifitasController.php b/app/Http/Controllers/Pengaturan/UploadAktifitasController.php
index 9fd2c81..86a53d4 100644
--- a/app/Http/Controllers/Pengaturan/UploadAktifitasController.php
+++ b/app/Http/Controllers/Pengaturan/UploadAktifitasController.php
@@ -3,9 +3,11 @@
 namespace App\Http\Controllers\Pengaturan;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\File;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Models\SumberDataEF;
-use App\Models\EF;
+use App\Models\FileDataAktivitas;
 use App\Models\Master\Sektor;
 
 class UploadAktifitasController extends Controller
@@ -35,11 +37,8 @@ class UploadAktifitasController extends Controller
 
     public function grid(Request $request)
     {
-        if(request()->activity){
-            $data = EF::with(['activity','sumberdata'])->where('ms_activity_id',decode_id(request()->activity))->orderBy('nomor_baris','ASC')->get();
-        }else{
-            $data = EF::with(['activity','sumberdata'])->orderBy('nomor_baris','ASC')->get();
-        }
+        
+        $data = FileDataAktivitas::with(['sektor'])->get();
         $_data = [];
 
 
@@ -53,23 +52,24 @@ class UploadAktifitasController extends Controller
             }else{
                 $status = '<span class="btn btn-sm btn-block btn-success"> Aktif </span>';
             }
+            $file = '<a download href="'.asset($row->file).'"  class="btn btn-sm w-100 btn-success"><i class="mdi mdi-download text-white"></i></a>';
             $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->EFId).'" href="'.url('pengaturan/ef/update/'.encode_id($row->EFId)).'" data-toggle="tooltip" title="Edit Data" class="btn btn-sm btn-block btn-primary"><i class="mdi mdi-pencil text-white"></i></a>';
+                $action .= '<a data-id="'.encode_id($row->FileDataAktivitasId).'" href="'.url('pengaturan/upload-aktifitas/update/'.encode_id($row->FileDataAktivitasId)).'" 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/ef/delete/'.encode_id($row->EFId)).'" 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 .= '<a href="#" data-href="'.url('pengaturan/upload-aktifitas/delete/'.encode_id($row->FileDataAktivitasId)).'" 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->EFId),
-                'activity'          => @$row->activity->nama,
-                'sumberdata'        => @$row->sumberdata->nama,
-                'kategori'          => @$row->category,
-                'kode'              => @$row->kode,
-                'nilai'             => @$row->value,
+                'id'                => encode_id($row->FileDataAktivitasId),
+                'sektor'            => @$row->sektor->nama,
+                'tahun'              => @$row->tahun,
+                'nama'              => @$row->nama,
+                'file'              => @$file,
+                'created_at'              => date('d-m-Y H:i:s',strtotime(@$row->created_at)),
                 'status'            => @$status,
                 'action'            => @$action,
         ];
@@ -94,41 +94,60 @@ class UploadAktifitasController extends Controller
      */
     public function store(Request $request)
     {
+        // dd(request()->all());
         $request->validate([
-            'ms_activity_id'   => 'required',
-            'sumberdata_ef_id' => 'required',
-            'value'            => 'required',
-            'category'         => 'required|string|max:255',
-            'tag_1'            => 'nullable|string|max:255',
-            'tag_2'            => 'nullable|string|max:255',
-            'tag_3'            => 'nullable|string|max:255',
+            'sektor'         => 'required',
+            'tahun'          => 'required',
+            'nama'           => 'required',
+            'file'           => 'required|file|mimes:xls,xlsx,pdf,png,jpg,jpeg,docx|max:2000',
         ]);
 
         try {
+
+            if (@$request->file) {
+                $file = $request->file;
+                $destinationPath = public_path('uploads/data_aktifitas');
+                $current = Carbon::now()->format('Y/m/d');
+                $path = $destinationPath . '/' . $current;
+                $fileName = $file->getClientOriginalName();
+                $fileMime = $file->getClientMimeType();
+                $fileExtension = $file->getClientOriginalExtension();
+                $fileSize = $file->getSize();
+                if(($fileExtension != 'xls') && ($fileExtension != 'xlsx') && ($fileExtension != 'pdf') && ($fileExtension != 'docx') && ($fileExtension != 'png') && ($fileExtension != 'jpg') && ($fileExtension != 'jpeg') ){
+                    return redirect()->back()->with([
+                        'message' => 'Maaf File Harus Berupa xls,xlsx,pdf,png,jpg,jpeg,docx!',
+                        'type'    => "error"
+                    ]);   
+                }
+                $newFilename = session('id').'_'.uniqid('file_') . '.' . $fileExtension;
+
+                if (!File::exists($path)) {
+                    File::isDirectory($path) or File::makeDirectory($path, 0777, true, true);
+                }
+
+                $filePath = 'data_aktifitas/' . $current . '/' . $newFilename;
+                $uploaded = $file->move($path, $newFilename);
+            }
+
+            
             if(@request()->secure_id){
                 $keyId = decode_id(@request()->secure_id);
-                $data = EF::find($keyId);
-                $data->ms_activity_id    = decode_id($request->ms_activity_id);
-                $data->tag_1             = $request->tag_1;
-                $data->tag_2             = $request->tag_2;
-                $data->tag_3             = $request->tag_3;
-                $data->category          = $request->category;
-                $data->sumberdata_ef_id  = decode_id($request->sumberdata_ef_id);
-                $data->value             = $request->value;
-                $data->deskripsi         = $request->deskripsi;
-                $data->status            = $request->status;
+                $data = FileDataAktivitas::find($keyId);
+                $data->ms_sektor_id         = decode_id($request->sektor);
+                $data->ms_subsektor_id      = @$request->subsektor ? decode_id($request->subsektor) : NULL;
+                $data->tahun                = $request->tahun;
+                $data->nama                 = $request->nama;
+                $data->file                 = $filePath;
+                $data->deskripsi            = $request->deskripsi;
                 $data->save();
             }else{
-                $data = new EF;
-                $data->ms_activity_id    = decode_id($request->ms_activity_id);
-                $data->tag_1             = $request->tag_1;
-                $data->tag_2             = $request->tag_2;
-                $data->tag_3             = $request->tag_3;
-                $data->category          = $request->category;
-                $data->sumberdata_ef_id  = decode_id($request->sumberdata_ef_id);
-                $data->value             = $request->value;
-                $data->deskripsi         = $request->deskripsi;
-                $data->status            = $request->status;
+                $data = new FileDataAktivitas;
+                $data->ms_sektor_id         = decode_id($request->sektor);
+                $data->ms_subsektor_id      = @$request->subsektor ? decode_id($request->subsektor) : NULL;
+                $data->tahun                = $request->tahun;
+                $data->nama                 = $request->nama;
+                $data->file                 = $filePath;
+                $data->deskripsi            = $request->deskripsi;
                 $data->save();
             }
             
@@ -169,15 +188,14 @@ class UploadAktifitasController extends Controller
         $data['breadcrumbs'] = [
             ['name' => 'Dashboard'],
             ['name' => 'Pengaturan'],
-            ['name' => 'AR','active' => true],
+            ['name' => 'Data Aktivitas','active' => true],
         ];
         $keyId = decode_id($id);
         $data['title'] = $this->title;
         $data['route'] = $this->route;
         $data['keyId'] = $id;
-        $data['item'] = EF::where('EFId',$keyId)->first();
-        $data['activity'] = Activity::all();
-        $data['sumberdata'] = SumberDataEF::all();
+        $data['item'] = FileDataAktivitas::where('FileDataAktivitasId',$keyId)->first();
+        $data['sektor'] = Sektor::all();
 
         return view($this->template.'.form',$data);
     }
@@ -186,7 +204,7 @@ class UploadAktifitasController extends Controller
     {
         $keyId = decode_id($id);
 
-        $data = EF::where('EFId',$keyId)->delete();
+        $data = FileDataAktivitas::where('FileDataAktivitasId',$keyId)->delete();
 
         return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']);
     }
diff --git a/app/Models/FileDataAktivitas.php b/app/Models/FileDataAktivitas.php
index e4c548c..3023c15 100644
--- a/app/Models/FileDataAktivitas.php
+++ b/app/Models/FileDataAktivitas.php
@@ -7,9 +7,13 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class FileDataAktivitas extends Model
 {
-    use SoftDeletes;
+    // use SoftDeletes;
     protected $table = 'file_data_aktivitas';
     protected $primaryKey = 'FileDataAktivitasId';
 
     protected $guarded = [];
+
+    function sektor(){
+        return $this->belongsTo(\App\Models\Master\Sektor::class,'ms_sektor_id');
+    }
 }
diff --git a/public/uploads/data_aktifitas/2025/12/17/ZApMyNHcQJmhxFCoRlt4gp1idR5ED3HmD6hxegmV.xlsx b/public/uploads/data_aktifitas/2025/12/17/ZApMyNHcQJmhxFCoRlt4gp1idR5ED3HmD6hxegmV.xlsx
new file mode 100644
index 0000000..26c5efe
Binary files /dev/null and b/public/uploads/data_aktifitas/2025/12/17/ZApMyNHcQJmhxFCoRlt4gp1idR5ED3HmD6hxegmV.xlsx differ
diff --git a/public/uploads/data_aktifitas/2025/12/17/fQvMqUw1Be29YiBEElpj2jVJmWC90TbfZEqokiIY.xlsx b/public/uploads/data_aktifitas/2025/12/17/fQvMqUw1Be29YiBEElpj2jVJmWC90TbfZEqokiIY.xlsx
new file mode 100644
index 0000000..26c5efe
Binary files /dev/null and b/public/uploads/data_aktifitas/2025/12/17/fQvMqUw1Be29YiBEElpj2jVJmWC90TbfZEqokiIY.xlsx differ
diff --git a/public/uploads/data_aktifitas/2025/12/17/hfSGZiym30vX7sun42QtSAkIxzoCaJ0HPxk8lOVD.xlsx b/public/uploads/data_aktifitas/2025/12/17/hfSGZiym30vX7sun42QtSAkIxzoCaJ0HPxk8lOVD.xlsx
new file mode 100644
index 0000000..26c5efe
Binary files /dev/null and b/public/uploads/data_aktifitas/2025/12/17/hfSGZiym30vX7sun42QtSAkIxzoCaJ0HPxk8lOVD.xlsx differ
diff --git a/public/uploads/data_aktifitas/2025/12/17/jB5lw9wakD4zZ4JmFnuGLNpeBwp59XdXXBEId6uR.xlsx b/public/uploads/data_aktifitas/2025/12/17/jB5lw9wakD4zZ4JmFnuGLNpeBwp59XdXXBEId6uR.xlsx
new file mode 100644
index 0000000..45d22a7
Binary files /dev/null and b/public/uploads/data_aktifitas/2025/12/17/jB5lw9wakD4zZ4JmFnuGLNpeBwp59XdXXBEId6uR.xlsx differ
diff --git a/public/uploads/data_aktifitas/2025/12/17/pnUqcoLcDIpehKbgCHHCN9oGwR5aG9Cd15NyLOhJ.docx b/public/uploads/data_aktifitas/2025/12/17/pnUqcoLcDIpehKbgCHHCN9oGwR5aG9Cd15NyLOhJ.docx
new file mode 100644
index 0000000..b07d545
Binary files /dev/null and b/public/uploads/data_aktifitas/2025/12/17/pnUqcoLcDIpehKbgCHHCN9oGwR5aG9Cd15NyLOhJ.docx differ
diff --git a/resources/views/modules/pengaturan/upload-aktifitas/form.blade.php b/resources/views/modules/pengaturan/upload-aktifitas/form.blade.php
index 51a8661..6af828b 100644
--- a/resources/views/modules/pengaturan/upload-aktifitas/form.blade.php
+++ b/resources/views/modules/pengaturan/upload-aktifitas/form.blade.php
@@ -8,7 +8,7 @@
                     <div class="card-header">
                         <i class="mdi mdi-account"></i> {{$title}}
                     </div>
-                    <form action="{{route($route.'.store')}}" method="POST" class="">
+                    <form action="{{route($route.'.store')}}" method="POST" class="" enctype="multipart/form-data">
                     {{csrf_field()}}
                     <div class="card-body">
                         <div class="row">
@@ -18,10 +18,47 @@
 
                             <div class="col-12 mb-3">
                                 <div class="form-group">
-                                    <label class="col-xl-12 form-label">Kode</label>
+                                    <label class="col-xl-12 form-label">Sektor</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')
+                                        <select name="sektor" class="select2" id="sektor" required>
+                                            <option value=""> PILIH SEKTOR </option>
+                                            @foreach ($sektor as $datasektor )
+                                                <option {{ @$item->ms_sektor_id == $datasektor->MsSektorId ? 'selected' : '' }} value="{{encode_id($datasektor->MsSektorId)}}">{{$datasektor->nama}}</option>
+                                            @endforeach
+                                        </select>
+                                        @error('sektor')
+                                        <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">Sektor</label>
+                                    <div class="col-12 ">
+                                        <select name="subsektor" class=" select2" id="subsektor">
+                                            <option value=""> PILIH SUB SEKTOR </option>
+                                        </select>
+                                        @error('subsektor')
+                                        <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">Tahun</label>
+                                    <div class="col-12 ">
+                                        <select name="tahun" class=" select2" id="">
+                                            <option value=""> PILIH TAHUN </option>
+                                            @for ($i = date('Y')-5; date('Y') > $i; $i++)
+                                                <option {{ @$item->tahun == $i ? 'selected' : '' }} value="{{$i}}">{{$i}}</option>
+                                            @endfor
+                                            <option {{ @$item->tahun == date('Y') ? 'selected' : '' }} value="{{date('Y')}}">{{date('Y')}}</option>
+                                        </select>
+                                        @error('tahun')
                                         <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
                                         @enderror
                                     </div>
@@ -44,7 +81,7 @@
                                 <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>
+                                        <textarea name="deskripsi" class="form-control @error('deskripsi') is-invalid @enderror" placeholder="Masukan Deskripsi" 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
@@ -54,25 +91,17 @@
 
                             <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>
+                                    <label class="col-xl-12 form-label d-flex justify-content-between align-items-center">
+                                        <span>File Dokumen</span>
+                                        @if(@$item->file)
+                                            <a download href="{{ asset($item->file) }}"  class="btn btn-sm btn-success">Download File <i class="mdi mdi-download text-white"></i></a>
+                                        @endif
 
-                            <div class="col-12 mb-3">
-                                <div class="form-group">
-                                    <label class="col-xl-12 form-label">Status</label>
+                                    </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')
+                                        <input type="file" accept=".pdf,.xls,.xlsx,.docx,.png,.jpg,.jpeg" value="{{@$item->file ? @$item->file :  old('file')}}" name="file"  class="form-control @error('file') is-invalid @enderror" required>
+                                        <small class="text-danger"><i>Max File : 2MB</i></small>
+                                        @error('file')
                                         <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
                                         @enderror
                                     </div>
@@ -97,4 +126,90 @@
 </div>
 @endsection
 @section('js')
+<script type="text/javascript">
+    function clear(elementId) {
+        $('#' + elementId).empty();
+        $('#' + elementId).select2();
+    }
+
+    $('select').on("select2:selecting", function(e) {
+        var selectorOrigin = this.id;
+        var id = e.params.args.data.id;
+        
+        
+        if(selectorOrigin=='sektor'){
+            $('#loading-spinner').show();
+            clear('subsektor');
+            selector = 'subsektor';
+            url_to = 'subsektor';
+            getSelect(id, selector, url_to);
+        }
+    });
+
+    function getSelect(id, selectTo, urlTo, selected = "") {
+        id = id;
+        var base_url = "{{url('/')}}";
+        //alert(id);
+        destino = "#" + selectTo;
+        valor = $('#' + id).find(":selected").val();
+
+        $.ajax({
+            method: "POST",
+            url: base_url + "/get/" + urlTo,
+            data: {
+            _token: '{{csrf_token()}}',
+            id: id
+            }
+        })
+        .done(function(msg) {
+            obj = msg.data;
+
+            if (obj.length > 0) {
+            //Clear the current options
+            $(destino).empty();
+            
+            if(selectTo=='subsektor'){
+                $(destino).append('<option value="">-PILIH SUBSEKTOR-</option>');
+
+
+                
+                $.each(obj, function(index) {
+                    value = obj[index].id;
+                    text = obj[index].name;
+                    $(destino).append('<option value=' + value + '>' + text + '</option>');
+                });
+                console.log(selected)
+                if (selected) {
+                    $(destino).val(selected).trigger('change');
+                    selected = "";
+                }
+            }
+
+            
+            } else {
+
+            if(selectTo=='subsektor'){
+                $(destino).empty().append('<option value="">-PILIH SUBSEKTOR-</option>');
+            }
+            }
+            $('#loading-spinner').hide();
+        });
+        return false;
+    }
+
+    function queryParams(params) {
+        $('#toolbar').find('input[name], select').each(function() {
+            params[$(this).attr('name')] = $(this).val()
+        })
+
+        return params
+    }
+
+    function ajaxRequest(params) {
+        var url = "{{ route($route.'.grid') }}";
+        $.get(url + '?' + $.param(params.data)).then(function (res) {
+            params.success(res)
+        })
+    }
+</script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/modules/pengaturan/upload-aktifitas/index.blade.php b/resources/views/modules/pengaturan/upload-aktifitas/index.blade.php
index 5282ccf..52cf0c7 100644
--- a/resources/views/modules/pengaturan/upload-aktifitas/index.blade.php
+++ b/resources/views/modules/pengaturan/upload-aktifitas/index.blade.php
@@ -58,10 +58,11 @@
                             <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="sektor">Sektor</th>
+                                <th data-field="tahun">Tahun</th>
                                 <th data-field="nama">Nama</th>
-                                <th data-field="nomor_baris">Nomor Baris</th>
-                                <th data-field="status">Status</th>
+                                <th data-field="file">File</th>
+                                <th data-field="created_at">Tanggal Upload</th>
                             </tr>
                             </thead>
                             <tbody></tbody>