fix exclude is_valid false and clickable dashboard simbg

resources/views/dashboards/bigdata.blade.php

@@ -58,7 +58,7 @@
             'document_id' => 'chart-total-potensi',
             'visible_small_circle' => true,
             'style' => 'left:400px;top:150px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'potention'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'potention', 'year' => date('Y')])
         ])
         @endcomponent
 
@@ -82,16 +82,7 @@
         <div class="square dia-top-right-bottom-left" style="top:150px;left:550px;">
         </div>
 
-        @component('components.circle', [
-            'document_title' => 'Non Usaha',
-            'document_color' => '#399787',
-            'document_type' => 'Berkas',
-            'document_id' => 'chart-non-business',
-            'visible_small_circle' => true,
-            'style' => 'left:900px;top:150px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'non-business'])
-        ])
-        @endcomponent
+
 
         <div class="square dia-top-right-bottom-left" style="top:80px;left:1050px;width:150px;height:150px;">
         </div>
@@ -143,6 +134,17 @@
             />
         </div>
 
+        @component('components.circle', [
+            'document_title' => 'Non Usaha',
+            'document_color' => '#399787',
+            'document_type' => 'Berkas',
+            'document_id' => 'chart-non-business',
+            'visible_small_circle' => true,
+            'style' => 'left:900px;top:150px;',
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'non-business', 'year' => date('Y')])
+        ])
+        @endcomponent
+
         @component('components.circle', [
             'document_title' => 'Usaha',
             'document_color' => '#5e7c89',
@@ -150,7 +152,7 @@
             'document_id' => 'chart-business',
             'visible_small_circle' => true,
             'style' => 'left:900px;top:400px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'business'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'business', 'year' => date('Y')])
         ])
         @endcomponent
 
@@ -161,7 +163,7 @@
             'document_id' => 'chart-berkas-terverifikasi',
             'visible_small_circle' => true,
             'style' => 'top:300px;left:200px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'verified'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'verified', 'year' => date('Y')])
         ])
         @endcomponent
 
@@ -178,7 +180,7 @@
             'document_id' => 'chart-berkas-belum-terverifikasi',
             'visible_small_circle' => true,
             'style' => 'top:300px;left:600px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'non-verified'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'non-verified', 'year' => date('Y')])
         ])
         @endcomponent
 
@@ -196,7 +198,7 @@
             'document_id' => 'chart-realisasi-tebit-pbg',
             'visible_small_circle' => true,
             'style' => 'top:550px;left:100px;',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'issuance-realization-pbg'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'issuance-realization-pbg', 'year' => date('Y')])
             ])
         @endcomponent
 
@@ -210,7 +212,7 @@
             'document_id' => 'chart-menunggu-klik-dpmptsp',
             'visible_small_circle' => true,
             'style' => 'top:550px;left:400px',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'waiting-click-dpmptsp'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'waiting-click-dpmptsp', 'year' => date('Y')])
             ])
         @endcomponent
 
@@ -224,7 +226,7 @@
             'document_id' => 'chart-proses-dinas-teknis',
             'visible_small_circle' => true,
             'style' => 'top:550px;left:700px',
-            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'process-in-technical-office'])
+            'document_url' => route('pbg-task.index', ['menu_id' => $menus->where('url','pbg-task.index')->first()->id, 'filter' => 'process-in-technical-office', 'year' => date('Y')])
             ])
         @endcomponent
     </div>

resources/views/pbg_task/index.blade.php

@@ -44,9 +44,10 @@
         </div>
 
         <form id="filter-form">
-          <div class="row pb-3">
-            <div class="col-md-4">
-              <select name="filter" id="filter-select" class="form-select">
+          <div class="row pb-3 align-items-end">
+            <div class="col-lg-3 col-md-4 mb-2">
+              <label for="filter-select" class="form-label fw-semibold text-dark">Filter Type</label>
+              <select name="filter" id="filter-select" class="form-select form-select-sm border-2">
                 @foreach ($filterOptions as $key => $label)
                   <option value="{{ $key }}" {{ request('filter') == $key ? 'selected' : '' }}>
                     {{ $label }}
@@ -55,8 +56,32 @@
               </select>
               <input name="menu_id" value="13" type="hidden" />
             </div>
-            <div class="col-md-2">
-              <button type="submit" class="btn btn-primary w-100">Apply</button>
+            <div class="col-lg-2 col-md-3 mb-2">
+              <label for="year-select" class="form-label fw-semibold text-dark">Tahun</label>
+              <select name="year" id="year-select" class="form-select form-select-sm border-2">
+                @php
+                  $currentYear = date('Y');
+                  $selectedYear = request('year', 2025); // Default to 2025
+                @endphp
+                @for ($year = $currentYear; $year >= 2020; $year--)
+                  <option value="{{ $year }}" {{ $selectedYear == $year ? 'selected' : '' }}>
+                    {{ $year }}
+                  </option>
+                @endfor
+              </select>
+            </div>
+            <div class="col-lg-4 col-md-4 mb-2">
+              <div class="d-flex gap-2">
+                <button type="submit" class="btn btn-primary btn-sm py-2 fw-semibold shadow-sm">
+                  <i class="fas fa-filter me-1"></i>Terapkan
+                </button>
+                <button type="button" id="reset-filter" class="btn btn-outline-secondary btn-sm py-2 fw-semibold">
+                  <i class="fas fa-undo me-1"></i>Reset
+                </button>
+              </div>
+            </div>
+            <div class="col-lg-1 col-md-0">
+              <!-- Space for additional controls if needed -->
             </div>
           </div>
         </form>