diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 3972412..099d500 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -20,25 +20,26 @@ class AjaxController extends Controller
         $resource = json_decode($instansi->resource_data);
         // dd($resource);
 
-        // if(@$resource){
-        //     $data = Template::whereIn('MsTemplateId',$resource)->count();
+        if(@$resource){
+            $data = TabelData::whereIn('MsTabelDataId',$resource)->count();
         
-        //     if(@$data != 0){
-        //         $data = Template::whereIn('MsTemplateId',$resource)->get();
-        //     }else{
-        //         $data = Template::all();
-        //     }
-        // }else{
-        //     $data = Template::all();
-        // }
+            if(@$data != 0){
+                $data = TabelData::whereIn('MsTabelDataId',$resource)->get();
+            }else{
+                $data = TabelData::all();
+            }
+        }else{
+            $data = TabelData::all();
+        }
 
-        $data = TabelData::all();
+        // $data = TabelData::all();
         
         foreach ($data as $key => $value) {
             // $filename = pathinfo($value->template_url, PATHINFO_FILENAME); 
 
             $_data[$key]['id'] = encode_id($value->MsTabelDataId);
             $_data[$key]['name'] = 'Tabel '.$value->nomor_tabel.' - '.$value->name;
+            $_data[$key]['name2'] = $value->name;
             $_data[$key]['excel'] = url('opendata/dataset/generateTemplate/'.encode_id($value->MsTabelDataId));
         }
 
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index bcf1850..5f9805d 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -94,14 +94,14 @@
             <div class="flex gap-4">
                 <div class="w-1/2">
                     <div class="flex flex-col gap-2">
-                        <div data-d="Eksploitasi sumber daya alam" data-p="Fragmentasi habitat" data-s="Penurunan populasi tumbuhan endemik" data-i="Gangguan penyerbukan pertanian" data-r="Penetapan area ekploitasi terbatas" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>1. Keanekaragaman Hayati</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Pengembangan industri sebagai mesin pertumbuhan ekonomi" data-p="Pembuangan air limbah (BOD, COD, TSS)" data-s="Penurunan kualitas air permukaan" data-i="Ketersediaan air bersih semakin berkurang" data-r="Instalasi pengolahan air limbah" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>2. Kualitas Air</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Urbanisasi pesisir" data-p="Pembuangan Limbah domestik ke laut" data-s="Degradasi terumbu karang" data-i="Penurunan hasil tangkapan ikan" data-r="Pengelolaan wilayah pesisir terpadu" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>3. Laut, Pesisir dan Pantai</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Peningkatan aktivitas transportasi" data-p="Emisi gas buang (CO2, NOx, SO2, PM2.5)" data-s="Konsentrasi polutan PM2.5" data-i="Gangguan kesehatan (ISPA)" data-r="Transportasi ramah lingkungan, penghijauan kota" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>4. Kualitas Udara</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Perluasan pemukiman" data-p="Alih fungsi lahan" data-s="Penurunan tutupan hutan" data-i="Erosi" data-r="Pengaturan Koefisien Dasar Bangunan < 50%" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>5. Lahan dan Hutan</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Peningkatan konsumsi" data-p="Produksi sampah berlebih" data-s="Timbunan sampah di TPA" data-i="Emisi metana" data-r="Ekonomi Sirkular" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>6. Pengelolaan Sampah dan Limbah</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Pertumbuhan ekonomi berbasis fosil" data-p="Emisi dari sektor energi & transportasi" data-s="Perubahan pola curah hujan (musim tak menentu)" data-i="Bencana hidrometeorologi meningkat (banjir, kekeringan)" data-r="Insentif ekonomi hijau" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>7. Perubahan Iklim</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
-                        <div data-d="Pembangunan tidak berkelanjutan" data-p="Pemukiman di daerah rawan" data-s="Kerentanan wilayah meningkat terhadap bencana" data-i="Kerugian ekonomi" data-r="Tata ruang berbasis risiko" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded-2xl h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>8. Risiko Bencana</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Eksploitasi sumber daya alam" data-p="Fragmentasi habitat" data-s="Penurunan populasi tumbuhan endemik" data-i="Gangguan penyerbukan pertanian" data-r="Penetapan area ekploitasi terbatas" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>1. Keanekaragaman Hayati</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Pengembangan industri sebagai mesin pertumbuhan ekonomi" data-p="Pembuangan air limbah (BOD, COD, TSS)" data-s="Penurunan kualitas air permukaan" data-i="Ketersediaan air bersih semakin berkurang" data-r="Instalasi pengolahan air limbah" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>2. Kualitas Air</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Urbanisasi pesisir" data-p="Pembuangan Limbah domestik ke laut" data-s="Degradasi terumbu karang" data-i="Penurunan hasil tangkapan ikan" data-r="Pengelolaan wilayah pesisir terpadu" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>3. Laut, Pesisir dan Pantai</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Peningkatan aktivitas transportasi" data-p="Emisi gas buang (CO2, NOx, SO2, PM2.5)" data-s="Konsentrasi polutan PM2.5" data-i="Gangguan kesehatan (ISPA)" data-r="Transportasi ramah lingkungan, penghijauan kota" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>4. Kualitas Udara</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Perluasan pemukiman" data-p="Alih fungsi lahan" data-s="Penurunan tutupan hutan" data-i="Erosi" data-r="Pengaturan Koefisien Dasar Bangunan < 50%" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>5. Lahan dan Hutan</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Peningkatan konsumsi" data-p="Produksi sampah berlebih" data-s="Timbunan sampah di TPA" data-i="Emisi metana" data-r="Ekonomi Sirkular" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>6. Pengelolaan Sampah dan Limbah</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Pertumbuhan ekonomi berbasis fosil" data-p="Emisi dari sektor energi & transportasi" data-s="Perubahan pola curah hujan (musim tak menentu)" data-i="Bencana hidrometeorologi meningkat (banjir, kekeringan)" data-r="Insentif ekonomi hijau" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>7. Perubahan Iklim</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
+                        <div data-d="Pembangunan tidak berkelanjutan" data-p="Pemukiman di daerah rawan" data-s="Kerentanan wilayah meningkat terhadap bencana" data-i="Kerugian ekonomi" data-r="Tata ruang berbasis risiko" class="dpsir hover:cursor-pointer bg-white/10 backdrop-blur-md border border-white/10 p-2 rounded h-full transition-all hover:bg-white hover:text-blue-900 hover:scale-105 flex justify-between items-center"><span>8. Risiko Bencana</span> <i data-lucide="arrow-right" class="text-white-600 w-5 h-5"></i></div>
                     </div>
                 </div>
                 <div>
diff --git a/resources/views/modules/opendata/dataset-tambahan/form.blade.php b/resources/views/modules/opendata/dataset-tambahan/form.blade.php
index 292203a..f8a33e3 100644
--- a/resources/views/modules/opendata/dataset-tambahan/form.blade.php
+++ b/resources/views/modules/opendata/dataset-tambahan/form.blade.php
@@ -21,7 +21,7 @@
                     @enderror
                 </div>
                 <div class="flex gap-4">
-                    <label class="mb-3 w-1/2 font-semibold required">Resource Data</label>
+                    <label class="mb-3 w-1/2 font-semibold required">Resource Data Related</label>
                     <select name="template_id" required class="p-2 border rounded w-full template_id select2 @error('template_id') is-invalid @enderror" id="">
                         <option value="">-</option>
                         @foreach($template as $dataTemplate)
@@ -64,11 +64,27 @@
                     @enderror
                 </div>
                 <div class="flex gap-4">
+                    <label class="mb-3 w-1/2 font-semibold">Tahun Sistem SLHD</label>
+                    <select name="tahun" class="p-2 bg-white rounded border w-full" id="">
+                        @for($i = (date('Y')-5); date('Y') >= $i ;  $i++)
+                        <option {{ (@$item ? (@$item->tahun == $i ? 'selected' : '') : ($i == date('Y') ? 'selected' : '') )}} value="{{$i}}">{{$i}}</option>
+                        @endfor
+                    </select>
+                </div>
+                <div class="flex gap-4">
+                    <label class="mb-3 w-1/2 font-semibold">Tahun Data</label>
+                    <select name="tahun_data" class="p-2 bg-white rounded border w-full" id="">
+                        @for($i = (date('Y')-5); date('Y')-1 >= $i ;  $i++)
+                            <option {{ (@$item ? (@$item->tahun_data == $i ? 'selected' : '') : ($i == date('Y')-1 ? 'selected' : '') )}} value="{{$i}}">{{$i}}</option>
+                        @endfor
+                    </select>
+                </div>
+                {{-- <div class="flex gap-4">
                     <label class="mb-3 w-1/2 font-semibold required">Data Tahun</label>
                     <select name="tahun" class="p-2 border rounded w-full" id="">
                         <option value="{{@$item->tahun ? @$item->tahun : date('Y')}}">{{@$item->tahun ? @$item->tahun : date('Y')}}</option>
                     </select>
-                </div>
+                </div> --}}
             </div>
             <div class="flex justify-center items-center gap-2">
                 <a href="{{route($route.'.index')}}" class="bg-red-500 rounded py-2 px-3 text-white flex items-center"><i data-lucide="arrow-left" class="w-4 h-4 mr-2"></i><span>Batal</span></a>
diff --git a/resources/views/modules/opendata/dataset/form.blade.php b/resources/views/modules/opendata/dataset/form.blade.php
index a050c96..73d517a 100644
--- a/resources/views/modules/opendata/dataset/form.blade.php
+++ b/resources/views/modules/opendata/dataset/form.blade.php
@@ -43,7 +43,7 @@
                 <div class="flex gap-4 mt-4">
                     <label class="mb-3 w-1/2 font-semibold required">Nama Dataset</label>
                     <div class="flex flex-col w-full justify-center items-start gap-2">
-                        <input type="text" value="{{@$item->name ? @$item->name :  old('name')}}" name="name" class="p-2 w-full bg-white rounded border @error('name') is-invalid @enderror" placeholder="Masukan Nama Dataset" required>
+                        <input type="text" readonly value="{{@$item->name ? @$item->name :  old('name')}}" name="name" class="p-2 w-full bg-gray-200 rounded border nama_dataset @error('name') is-invalid @enderror" placeholder="Masukan Nama Dataset" required>
                     </div>
                     @error('name')
                     <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
@@ -145,8 +145,9 @@
                     $.each(obj, function(index) {
                         value = obj[index].id;
                         text = obj[index].name;
+                        text2 = obj[index].name2;
                         excel = obj[index].excel;
-                        $(destino).append('<option data-template="'+excel+'" value=' + value + '>' + text + '</option>');
+                        $(destino).append('<option data-name="'+text2+'" data-template="'+excel+'" value=' + value + '>' + text + '</option>');
                     });
                     console.log(selected)
                     if (selected) {
@@ -204,8 +205,11 @@
 	<script type="text/javascript">
         $('.template_id').on('change',function(){
             var template = $(this).find(':selected').attr('data-template');
+            var name = $(this).find(':selected').attr('data-name');
             $('.btnDownload').attr('href',template);
+            $('.nama_dataset').val(name);
         });
+
         $('#template_default').on('change',function(){
             var instansi_id = $('.instansi_id').find(':selected').val();
             var val = $(this).find(':selected').val();