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 @@
| No. | +Tahun | + @foreach ($formDetails as $detail) + @php + $unitCode = $detail->unit_code; + $unitCategory = $unitsMap[$unitCode]->category ?? null; + @endphp ++ {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }}) + + @if ($unitCategory) + + @else + {{ $unitCode }} + @endif + | + @endforeach +|||
|---|---|---|---|---|---|
| No. | -Tahun | +{{ $k+1 }} | +{{ $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 -- {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }}) - - @if ($unitCategory) - - @else - {{ $unitCode }} - @endif - | +
+
+
+
+ |
@endforeach
| {{ $k+1 }} | -{{ $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 -