From b29eb1235b3d34f30c55a4ffeb11fff20b19ea65 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Fri, 5 Dec 2025 10:17:40 +0700
Subject: [PATCH] update

---
 resources/views/dataset-tambahan.blade.php | 78 +++++++++++-----------
 resources/views/dataset.blade.php          |  6 +-
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/resources/views/dataset-tambahan.blade.php b/resources/views/dataset-tambahan.blade.php
index 7017ae4..14d7dfc 100644
--- a/resources/views/dataset-tambahan.blade.php
+++ b/resources/views/dataset-tambahan.blade.php
@@ -23,47 +23,49 @@
     <section class="container py-20 px-5">
         <div class="flex flex-col lg:flex-row gap-6">
             <div class="bg-white text-center h-full rounded-[20px] shadow-lg p-5 py-10 gap-3 w-full lg:w-1/4">
-                <div class="flex justify-between">
-                    <div>
-                        <h1 class="bold">Filter</h1>
-                    </div>
-                    <div>
-                        <i class="ri-filter-line text-lg"></i>
-                    </div>
-                </div>
-                <div class="flex flex-col gap-6 mt-6">
-                    <div class="w-full">
-                        <h1 class="mb-3 text-left">Instansi</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
-                            <option value="">-- Pilih Instansi --</option>
-                            @foreach ($instansi as $dataInstansi)
-                                <option value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    <div class="w-full">
-                        <h1 class="mb-3 text-left">Resource Data</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
-                            <option value="">-- Pilih Resource Data --</option>
-                            @foreach ($template as $dataTemp)
-                                <option value="{{encode_id($dataTemp->MsTemplateId)}}">{{$dataTemp->name}}</option>
-                            @endforeach
-                        </select>
+                <form action="" method="GET">
+                    <div class="flex justify-between">
+                        <div>
+                            <h1 class="bold">Filter</h1>
+                        </div>
+                        <div>
+                            <i class="ri-filter-line text-lg"></i>
+                        </div>
                     </div>
+                    <div class="flex flex-col gap-6 mt-6">
+                        <div class="w-full">
+                            <h1 class="mb-3 text-left">Instansi</h1>
+                            <select class="form-input select2 rounded-[20px] w-full" name="instansi_id" id="">
+                                <option value="">-- Pilih Instansi --</option>
+                                @foreach ($instansi as $dataInstansi)
+                                    <option {{ decode_id(@request()->instansi_id) == $dataInstansi->MsInstansiId ? 'selected' : '' }} value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                        <div class="w-full">
+                            <h1 class="mb-3 text-left">Resource Data</h1>
+                            <select class="form-input select2 rounded-[20px] w-full" name="resource_id" id="">
+                                <option value="">-- Pilih Resource Data --</option>
+                                @foreach ($template as $dataTemp)
+                                    <option {{ decode_id(@request()->resource_id) == $dataTemp->MsTemplateId ? 'selected' : '' }} value="{{encode_id($dataTemp->MsTemplateId)}}">{{$dataTemp->name}}</option>
+                                @endforeach
+                            </select>
+                        </div>
 
-                    <div class="w-full">
-                        <h1 class="mb-3 text-left">Tahun</h1>
-                        <select class="form-input select2 rounded-[20px] w-full" name="" id="">
-                            <option value="">-- Pilih Tahun --</option>
-                            @for($i = date('Y'); $i >= (date('Y')-10); $i--)
-                                <option value="">{{$i}}</option>
-                            @endfor
-                        </select>
+                        <div class="w-full">
+                            <h1 class="mb-3 text-left">Tahun</h1>
+                            <select class="form-input select2 rounded-[20px] w-full" name="tahun" id="">
+                                <option value="">-- Pilih Tahun --</option>
+                                @for($i = date('Y'); $i >= (date('Y')-10); $i--)
+                                    <option {{ @request()->tahun == $i ? 'selected' : '' }} value="{{$i}}">{{$i}}</option>
+                                @endfor
+                            </select>
+                        </div>
+                        <div class="w-full">
+                            <button class="rounded w-full bg-[#E9811A] text-white px-2 py-1">Cari</button>
+                        </div>
                     </div>
-                    <div class="w-full">
-                        <button class="rounded w-full bg-[#E9811A] text-white px-2 py-1">Cari</button>
-                    </div>
-                </div>
+                </form>
             </div>
             <div class="w-full lg:w-3/4">
                 <div class="grid grid-cols-2 lg:grid-cols-3 gap-6">
diff --git a/resources/views/dataset.blade.php b/resources/views/dataset.blade.php
index 519a309..5543cdb 100644
--- a/resources/views/dataset.blade.php
+++ b/resources/views/dataset.blade.php
@@ -38,7 +38,7 @@
                         <select class="form-input select2 rounded-[20px] w-full" name="instansi_id" id="">
                             <option value="">-- Pilih Instansi --</option>
                             @foreach ($instansi as $dataInstansi)
-                                <option value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
+                                <option {{ decode_id(@request()->instansi_id) == $dataInstansi->MsInstansiId ? 'selected' : '' }} value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
                             @endforeach
                         </select>
                     </div>
@@ -47,7 +47,7 @@
                         <select class="form-input select2 rounded-[20px] w-full" name="resource_id" id="">
                             <option value="">-- Pilih Resource Data --</option>
                             @foreach ($template as $dataTemp)
-                                <option value="{{encode_id($dataTemp->MsTemplateId)}}">{{$dataTemp->name}}</option>
+                                <option {{ decode_id(@request()->resource_id) == $dataTemp->MsTemplateId ? 'selected' : '' }} value="{{encode_id($dataTemp->MsTemplateId)}}">{{$dataTemp->name}}</option>
                             @endforeach
                         </select>
                     </div>
@@ -57,7 +57,7 @@
                         <select class="form-input select2 rounded-[20px] w-full" name="tahun" id="">
                             <option value="">-- Pilih Tahun --</option>
                             @for($i = date('Y'); $i >= (date('Y')-10); $i--)
-                                <option value="">{{$i}}</option>
+                                <option {{ @request()->tahun == $i ? 'selected' : '' }} value="{{$i}}">{{$i}}</option>
                             @endfor
                         </select>
                     </div>