From 508f59a7c3b1567355beec10f694e23910065e88 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Fri, 14 Aug 2026 15:44:18 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/Activity/FormController.php |   7 ++++++-
 app/Services/DashboardService.php                |   3 ++-
 app/Services/SigdCrudService.php                 |   3 ++-
 public/assets/~$kumen_pengesahan.docx            | Bin 162 -> 0 bytes
 resources/views/modules/form/action.blade.php    |   4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 public/assets/~$kumen_pengesahan.docx

diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php
index cdb8418..25a5da8 100644
--- a/app/Http/Controllers/Activity/FormController.php
+++ b/app/Http/Controllers/Activity/FormController.php
@@ -189,7 +189,12 @@ class FormController implements HasMiddleware
 
         try {
 
-            $form = ActivityForm::where('agency_id',$instansi)->first();
+            $form = ActivityForm::where('sector',$sector)
+            ->where('form_code',$code)
+            ->where('agency_id',$instansi)
+            ->where('inventory_year',$inventoryYear)
+            ->first();
+            
             // dd($form);
             if(!@$form){
                 $Saveform = new ActivityForm;
diff --git a/app/Services/DashboardService.php b/app/Services/DashboardService.php
index 464b7b1..37d90d7 100644
--- a/app/Services/DashboardService.php
+++ b/app/Services/DashboardService.php
@@ -12,7 +12,8 @@ class DashboardService
     {
         $gwpData = $this->getActiveGwpRecords()->keyBy('ghg_code');
 
-        $years = activityYearRange($inventoryYear, false, 10);
+        // $years = activityYearRange($inventoryYear, false, 10);
+        $years = activityYearRange($inventoryYear, false, 1);
 
         $crfData = ActivityCrf::with(['ws.form', 'sektor'])
             ->where('inventory_year', $inventoryYear)
diff --git a/app/Services/SigdCrudService.php b/app/Services/SigdCrudService.php
index f5511e1..8c27ca0 100644
--- a/app/Services/SigdCrudService.php
+++ b/app/Services/SigdCrudService.php
@@ -162,7 +162,8 @@ class SigdCrudService
 
         if ($form) {
             $query = ActivityFormDetail::where('form_id', $form->id)
-                ->where('activity_year', $activityYear)
+                // ->where('activity_year', $activityYear)
+                ->where('activity_year', $inventoryYear)
                 ->rowActive();
 
             if ($activityCodes !== null) {
diff --git a/public/assets/~$kumen_pengesahan.docx b/public/assets/~$kumen_pengesahan.docx
deleted file mode 100644
index 0ba1b600703e20d7b217c1eee02e52f6b8a3d1aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
ncmd<g%*ja1El(^;WFP@>GGsF3Fk~<!GUPIp1IZ#FrWF7Hyr~C&

diff --git a/resources/views/modules/form/action.blade.php b/resources/views/modules/form/action.blade.php
index 32d27b4..6b68a73 100644
--- a/resources/views/modules/form/action.blade.php
+++ b/resources/views/modules/form/action.blade.php
@@ -11,13 +11,13 @@
                 <div class="col-md-4">
                     <div class="form-group d-flex justify-content-center align-items-center gap-1">
                         <div class="">
-                            <label for="instansi">Instansi:</label>
+                            <label for="instansi">Instansi: {{ $instansi }}</label>
                         </div>
                         <div class="input-group">
                             <select name="instansi" id="instansi" class="form-control">
                                 <option value="" selected>-- Pilih Instansi --</option>
                                 @if ($scope === \App\Enums\LingkupAksesData::ALL->value)
-                                    <option value="none" @if ($instansi === null || $instansi == 'none') selected @endif>DATA
+                                    <option value="none" @if ($instansi == 'none') selected @endif>DATA
                                         KONSOLIDASI</option>
                                     @if ($agencies->isNotEmpty())
                                         <option value="all" @if ($instansi === 'all') selected @endif>SELURUH DATA DARI PRODUSEN</option>