diff --git a/resources/views/modules/form/table.blade.php b/resources/views/modules/form/table.blade.php index 30d2be4..59fcff0 100644 --- a/resources/views/modules/form/table.blade.php +++ b/resources/views/modules/form/table.blade.php @@ -16,6 +16,12 @@ @endphp {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }}) + + @if ($unitCategory) + + @else + {{ $unitCode }} + @endif @endforeach @@ -31,17 +37,12 @@ @foreach ($formDetails as $detail) @php - $activity_value = ''; - - if (isset($activityFormDetails[$year])) { - $activityData = $activityFormDetails[$year] - ->where('activity_code', $detail->activity_code) - ->where('activity_unit_code', $detail->unit_code) - ->first(); - - $activity_value = $activityData->activity_value ?? ''; - } - + $activity_value = isset($activityFormDetails[$year]) + ? $activityFormDetails[$year] + ->where('activity_code', $detail->activity_code) + ->where('activity_unit_code', $detail->unit_code) + ->first()->activity_value ?? '' + : ''; @endphp
@@ -59,5 +60,6 @@

+ @endif