update
parent
565faeaeec
commit
89d198c629
|
|
@ -16,6 +16,12 @@
|
||||||
@endphp
|
@endphp
|
||||||
<th style="min-width: 150px; text-decoration:normal">
|
<th style="min-width: 150px; text-decoration:normal">
|
||||||
{{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }})
|
{{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }})
|
||||||
|
|
||||||
|
@if ($unitCategory)
|
||||||
|
|
||||||
|
@else
|
||||||
|
{{ $unitCode }}
|
||||||
|
@endif
|
||||||
</th>
|
</th>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -31,17 +37,12 @@
|
||||||
@foreach ($formDetails as $detail)
|
@foreach ($formDetails as $detail)
|
||||||
@php
|
@php
|
||||||
|
|
||||||
$activity_value = '';
|
$activity_value = isset($activityFormDetails[$year])
|
||||||
|
? $activityFormDetails[$year]
|
||||||
if (isset($activityFormDetails[$year])) {
|
->where('activity_code', $detail->activity_code)
|
||||||
$activityData = $activityFormDetails[$year]
|
->where('activity_unit_code', $detail->unit_code)
|
||||||
->where('activity_code', $detail->activity_code)
|
->first()->activity_value ?? ''
|
||||||
->where('activity_unit_code', $detail->unit_code)
|
: '';
|
||||||
->first();
|
|
||||||
|
|
||||||
$activity_value = $activityData->activity_value ?? '';
|
|
||||||
}
|
|
||||||
|
|
||||||
@endphp
|
@endphp
|
||||||
<td>
|
<td>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
|
|
@ -59,5 +60,6 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
<button type="submit" class="btn btn-primary" {{ $isLocked || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>Simpan</button>
|
||||||
@endif
|
@endif
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue