diff --git a/app/Http/Controllers/Pengaturan/PengumumanController.php b/app/Http/Controllers/Pengaturan/PengumumanController.php
index 8cf38c6..30c4c24 100644
--- a/app/Http/Controllers/Pengaturan/PengumumanController.php
+++ b/app/Http/Controllers/Pengaturan/PengumumanController.php
@@ -4,15 +4,77 @@ namespace App\Http\Controllers\Pengaturan;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
+use Carbon\Carbon;
+use App\Models\FilePengumuman;
 
 class PengumumanController extends Controller
 {
+    protected $title = 'Pengumuman/Peraturan';
+    protected $template = 'modules.pengaturan.pengumuman';
+    protected $route = 'modules.pengaturan.pengumuman';
+
     /**
      * Display a listing of the resource.
      */
     public function index()
     {
-        //
+        permission('is_read', $this->route, 'module',true);
+        
+        $data['breadcrumbs'] = [
+            ['name' => 'Dashboard'],
+            ['name' => 'Pengaturan'],
+            ['name' => 'Pengumuman/Peraturan','active' => true],
+        ];
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;
+
+        return view($this->template.'.index',$data);
+    }
+
+    public function grid(Request $request)
+    {
+        
+        $data = FilePengumuman::all();
+        $_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>';
+            }
+            $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->FilePengumumanId).'" href="'.url('pengaturan/pengumuman/update/'.encode_id($row->FilePengumumanId)).'" 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/pengumuman/delete/'.encode_id($row->FilePengumumanId)).'" 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->FilePengumumanId),
+                '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,
+        ];
+
+        }
+
+        // return response()->json($_data);  // Return the data as a JSON response
+        return response()->json($_data);
+
     }
 
     /**
@@ -28,7 +90,69 @@ class PengumumanController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        // dd(request()->all());
+        $request->validate([
+            '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/pengumuman');
+                $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 = 'pengumuman/' . $current . '/' . $newFilename;
+                $uploaded = $file->move($path, $newFilename);
+            }
+
+            
+            if(@request()->secure_id){
+                $keyId = decode_id(@request()->secure_id);
+                $data = FilePengumuman::find($keyId);
+                $data->tahun                = $request->tahun;
+                $data->nama                 = $request->nama;
+                $data->file                 = $filePath;
+                $data->deskripsi            = $request->deskripsi;
+                $data->save();
+            }else{
+                $data = new FilePengumuman;
+                $data->tahun                = $request->tahun;
+                $data->nama                 = $request->nama;
+                $data->file                 = $filePath;
+                $data->deskripsi            = $request->deskripsi;
+                $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 +174,29 @@ class PengumumanController 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' => 'Data Aktivitas','active' => true],
+        ];
+        $keyId = decode_id($id);
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;
+        $data['keyId'] = $id;
+        $data['item'] = FilePengumuman::where('FilePengumumanId',$keyId)->first();
+
+        return view($this->template.'.form',$data);
+    }
+
+    public function delete($id)
+    {
+        $keyId = decode_id($id);
+
+        $data = FilePengumuman::where('FilePengumumanId',$keyId)->delete();
+
+        return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']);
     }
 
     /**
diff --git a/app/Models/FilePengumuman.php b/app/Models/FilePengumuman.php
index 8dfb8a6..f4f2e72 100644
--- a/app/Models/FilePengumuman.php
+++ b/app/Models/FilePengumuman.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class FilePengumuman extends Model
 {
-    use SoftDeletes;
+    // use SoftDeletes;
     protected $table = 'file_pengumuman';
     protected $primaryKey = 'FilePengumumanId';
 
diff --git a/public/uploads/pengumuman/2025/12/18/_file_69437314dcabb.xlsx b/public/uploads/pengumuman/2025/12/18/_file_69437314dcabb.xlsx
new file mode 100644
index 0000000..45d22a7
Binary files /dev/null and b/public/uploads/pengumuman/2025/12/18/_file_69437314dcabb.xlsx differ
diff --git a/resources/views/modules/pengaturan/pengumuman/form.blade.php b/resources/views/modules/pengaturan/pengumuman/form.blade.php
index 51a8661..7fcba45 100644
--- a/resources/views/modules/pengaturan/pengumuman/form.blade.php
+++ b/resources/views/modules/pengaturan/pengumuman/form.blade.php
@@ -8,20 +8,25 @@
                     <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">
                             <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>
+                                    <label class="col-xl-12 form-label">Tahun</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="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 +49,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 +59,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 +94,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/pengumuman/index.blade.php b/resources/views/modules/pengaturan/pengumuman/index.blade.php
index 416a20a..4a5464e 100644
--- a/resources/views/modules/pengaturan/pengumuman/index.blade.php
+++ b/resources/views/modules/pengaturan/pengumuman/index.blade.php
@@ -8,33 +8,47 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="card">
+                    <div class="card-header">
+                        <a href="{{route($route.'.update')}}" id="btn-add" class="btn btn-primary">
+                            <i class="mdi mdi-upload"></i> Upload
+                        </a>
+                    </div>
                     <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 id="toolbar" class="">
+                            <div class="d-flex gap-1">
+                                <div>
+                                    <select name="tahun" class=" select2" id="">
+                                        <option value=""> PILIH TAHUN </option>
+                                        @for ($i = date('Y')-5; date('Y') > $i; $i++)
+                                            <option value="{{$i}}">{{$i}}</option>
+                                        @endfor
+                                        <option value="{{date('Y')}}">{{date('Y')}}</option>
+                                    </select>
+                                </div>
+                            </div>
                         </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">
+                            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-query-params="queryParams"
+                            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="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>
@@ -48,6 +62,22 @@
 @endsection
 @section('js')
 <script type="text/javascript">
+
+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)
+    })
+}
+
 $("#grid-data").on("click", ".remove_data", function() {
         var base_url = $(this).attr('data-href');
         var id = $(this).attr('data-id');