update
parent
90eafa477b
commit
342bd671b8
|
|
@ -21,7 +21,7 @@
|
||||||
<select name="unit_code[{{ $detail->activity_code }}]" class="form-control unit-code"
|
<select name="unit_code[{{ $detail->activity_code }}]" class="form-control unit-code"
|
||||||
data-activity-code="{{ $detail->activity_code }}"
|
data-activity-code="{{ $detail->activity_code }}"
|
||||||
data-current-unit="{{ $unitCode }}">
|
data-current-unit="{{ $unitCode }}">
|
||||||
@foreach ($unitsByCategory[$unitCategory] as $unit)
|
@foreach ($unitsByCategory[$unitCategory] ?? [] as $unit)
|
||||||
<option value="{{ $unit->code }}"
|
<option value="{{ $unit->code }}"
|
||||||
{{ $unit->code == $unitCode ? 'selected' : '' }}>
|
{{ $unit->code == $unitCode ? 'selected' : '' }}>
|
||||||
{{ $unit->code }}
|
{{ $unit->code }}
|
||||||
|
|
@ -46,12 +46,23 @@
|
||||||
@foreach ($formDetails as $detail)
|
@foreach ($formDetails as $detail)
|
||||||
@php
|
@php
|
||||||
|
|
||||||
$activity_value = isset($activityFormDetails[$year])
|
$activity_value = '';
|
||||||
? $activityFormDetails[$year]
|
|
||||||
|
if (isset($activityFormDetails[$year])) {
|
||||||
|
$activityData = $activityFormDetails[$year]
|
||||||
->where('activity_code', $detail->activity_code)
|
->where('activity_code', $detail->activity_code)
|
||||||
->where('activity_unit_code', $detail->unit_code)
|
->where('activity_unit_code', $detail->unit_code)
|
||||||
->first()->activity_value ?? ''
|
->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
|
@endphp
|
||||||
<td>
|
<td>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue