From 57b418392f3925787c7c12d924ce47cc1e35484c Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Fri, 12 Jun 2026 14:42:06 +0700 Subject: [PATCH] update --- resources/views/modules/form/index.blade.php | 81 ++++++++++---------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php index c23515a..cc52cb9 100644 --- a/resources/views/modules/form/index.blade.php +++ b/resources/views/modules/form/index.blade.php @@ -43,51 +43,54 @@
- + + + + + @foreach ($formDetails as $detail) + @php + $unitCode = $detail->unit_code; + $unitCategory = $unitsMap[$unitCode]->category ?? null; + @endphp + + @endforeach + + @php + $years = activityYearRange($inventoryYear); + @endphp + @foreach ($years as $k => $year) - - + + @foreach ($formDetails as $detail) @php - $unitCode = $detail->unit_code; - $unitCategory = $unitsMap[$unitCode]->category ?? null; + $activity_value = isset($activityFormDetails[$year]) + ? $activityFormDetails[$year] + ->where('activity_code', $detail->activity_code) + ->where('activity_unit_code', $detail->unit_code) + ->first()->activity_value ?? '' + : ''; @endphp - + @endforeach - - - @php - $years = activityYearRange($inventoryYear); - @endphp - @foreach ($years as $k => $year) - - - - @foreach ($formDetails as $detail) - @php - $activity_value = isset($activityFormDetails[$year]) - ? $activityFormDetails[$year] - ->where('activity_code', $detail->activity_code) - ->where('activity_unit_code', $detail->unit_code) - ->first()->activity_value ?? '' - : ''; - @endphp - - @endforeach - - @endforeach - + @endforeach
No.Tahun + {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }}) + + @if ($unitCategory) + + @else + {{ $unitCode }} + @endif +
No.Tahun{{ $k+1 }}{{ $year }} - {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }}) - - @if ($unitCategory) - - @else - {{ $unitCode }} - @endif - +
+ +
+
{{ $k+1 }}{{ $year }} - -
{{-- @include('modules.form.table') --}}