From 96459f29a66997a329950fd330c3709986b08367 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Tue, 18 Aug 2026 11:02:13 +0700
Subject: [PATCH] update

---
 .../Controllers/Activity/FormController.php   |  5 ++
 resources/views/modules/form/action.blade.php | 31 +++++++++--
 resources/views/modules/form/index.blade.php  | 55 ++++++++++++-------
 3 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php
index 25a5da8..d830b72 100644
--- a/app/Http/Controllers/Activity/FormController.php
+++ b/app/Http/Controllers/Activity/FormController.php
@@ -82,6 +82,11 @@ class FormController implements HasMiddleware
         })->get();
 
         // Fetch activity form and activity form details using service
+        if(request()->tahun){
+            $inventoryYear = request()->tahun;
+        }else{
+            $inventoryYear = request()->tahun;
+        }
         $activityForm = $this->formService->getActivityForm($sector, $code, $inventoryYear, $instansi);
         if ($instansi == 'all') {
             $activityFormId = $activityForm->pluck('id')->toArray();
diff --git a/resources/views/modules/form/action.blade.php b/resources/views/modules/form/action.blade.php
index 6b68a73..c7aec78 100644
--- a/resources/views/modules/form/action.blade.php
+++ b/resources/views/modules/form/action.blade.php
@@ -8,13 +8,13 @@
                 </div>
             </div> --}}
             <div class="row">
-                <div class="col-md-4">
+                <div class="col-md-4 d-flex gap-2">
                     <div class="form-group d-flex justify-content-center align-items-center gap-1">
-                        <div class="">
-                            <label for="instansi">Instansi: {{ $instansi }}</label>
-                        </div>
+                        {{-- <div class="">
+                            <label for="instansi">Instansi</label>
+                        </div> --}}
                         <div class="input-group">
-                            <select name="instansi" id="instansi" class="form-control">
+                            <select name="instansi" id="instansi" class="form-control" style="width: 100px!important;">
                                 <option value="" selected>-- Pilih Instansi --</option>
                                 @if ($scope === \App\Enums\LingkupAksesData::ALL->value)
                                     <option value="none" @if ($instansi == 'none') selected @endif>DATA
@@ -33,11 +33,32 @@
                             </select>
                         </div>
                     </div>
+                    <div class="form-group d-flex justify-content-center align-items-center gap-1">
+                        {{-- <div class="">
+                            <label for="instansi">Tahun</label>
+                        </div> --}}
+                        <div class="input-group">
+                            <select name="tahun" id="inventoryYear" class="form-control" style="width: 100px!important;">
+                                <option value="" selected>-- Pilih Tahun --</option>
+                                @foreach ($years as $k => $year)
+                                    <option value="{{ $year }}" {{ request()->tahun ==  $year ? 'selected' : ''}}>
+                                        {{ $year }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
                 </div>
                 <div class="col-md-8 order-md-2 d-flex gap-1 justify-content-end align-items-center flex-wrap">
                     <div class="form-group mb-0 mr-2 d-none">
                         @include('modules.form.approve')
                     </div>
+                    <div class="form-group mb-0 mr-2">
+                        <a title="Tambah Data" class="btn btn-info mb-2 mb-md-0" href="{{ url($form->sector.'/'.$form->code.'/update?tahun='.request()->tahun.'&&instansi='.request()->instansi) }}"
+                            {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
+                            <i class="bx bx-pencil"></i>
+                        </a>
+                    </div>
                     <div class="form-group mb-0 mr-2">
                         <a title="Tambah Data" class="btn btn-primary mb-2 mb-md-0" onclick="return showCreateModal()"
                             {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php
index a0be843..074b473 100644
--- a/resources/views/modules/form/index.blade.php
+++ b/resources/views/modules/form/index.blade.php
@@ -28,6 +28,8 @@
 
         $internal = $internal ?? null;
         $limitInternal = ($internal !== null) && !$agencies->isNotEmpty();
+
+        $years = activityYearRange($inventoryYear);
     @endphp
 
     <div class="card shadow-sm" data-sector="{{ $form->sector }}" data-code="{{ $form->code }}">
@@ -46,29 +48,44 @@
                         <table class="table table-bordered table-detail">
                             
                             <tr>
-                                <th>#</th>
-                                <th>No.</th>
+                                <th>No</th>
                                 <th>Tahun</th>
-                                @foreach ($formDetails as $detail)
+                                <th>Activity</th>
+                                <th>Value</th>
+                            </tr>
+                            @foreach ($formDetails as $k => $detail)
                                     @php
                                         $unitCode = $detail->unit_code;
                                         $unitCategory = $unitsMap[$unitCode]->category ?? null;
                                     @endphp
-                                    <th style="min-width: 150px; text-decoration:normal">
-                                        {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }})
-                                        
-                                        @if ($unitCategory)
-                                        
-                                        @else
-                                            {{ $unitCode }}
-                                        @endif
-                                    </th>
+                                    <tr>
+                                        <td>{{$k+1}}</td>
+                                        <td>{{request()->tahun}}</td>
+                                        <td style="min-width: 150px; text-decoration:normal">
+                                            {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }})
+                                            
+                                            @if ($unitCategory)
+                                            
+                                            @else
+                                                {{ $unitCode }}
+                                            @endif
+                                        </td>
+                                        @php
+                                            $activity_value = isset($activityFormDetails[request()->tahun])
+                                                ? $activityFormDetails[request()->tahun]
+                                                        ->where('activity_code', $detail->activity_code)
+                                                        ->where('activity_unit_code', $detail->unit_code)
+                                                        ->first()->activity_value ?? ''
+                                                : '';
+                                        @endphp
+                                        <td>
+                                            <div class="input-group">
+                                                {{ @$activity_value == "" ? "" : getFormattedValue($activity_value)}}
+                                            </div>
+                                        </td>
+                                    </tr>
                                 @endforeach
-                            </tr>
-                            @php
-                                $years = activityYearRange($inventoryYear);
-                            @endphp
-                            @foreach ($years as $k => $year)
+                            {{-- @foreach ($years as $k => $year)
                                 <tr>
                                     <td><a href="{{ url($form->sector.'/'.$form->code.'/update?tahun='.$year.'&&instansi='.$instansi) }}" class="btn btn-info btn-sm edit"><i class="bx bx-pencil"></i></a></td>
                                     <td>{{ $k+1 }}</td>
@@ -80,7 +97,7 @@
                                                         ->where('activity_code', $detail->activity_code)
                                                         ->where('activity_unit_code', $detail->unit_code)
                                                         ->first()->activity_value ?? ''
-                                                : ''
+                                                : '';
                                         @endphp
                                         <td>
                                             <div class="input-group">
@@ -89,7 +106,7 @@
                                         </td>
                                     @endforeach
                                 </tr>
-                            @endforeach
+                            @endforeach --}}
                         </table>
                     </div>
                 @endif