fix(penawaran): perbaiki pengolahan luas tanah dan bangunan pada dokumen
- Mengubah cara pengambilan dan penjumlahan luas tanah dan bangunan. - Memastikan nilai luas tanah dan bangunan ditampilkan dengan benar. - Mengoptimalkan pengolahan data detail dokumen untuk meningkatkan kejelasan.
This commit is contained in:
@@ -748,7 +748,7 @@
|
|||||||
<button type="button" class="flex-none btn btn-danger text-center" onclick="removeFileInput(this)">Remove</button>
|
<button type="button" class="flex-none btn btn-danger text-center" onclick="removeFileInput(this)">Remove</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
${customFieldsHtml}
|
${customFieldsHtml}
|
||||||
|
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|||||||
@@ -126,35 +126,41 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@php
|
@if($detail->details)
|
||||||
$details = json_decode($detail->details);
|
@php $luastanah = $luasbangunan = null; @endphp
|
||||||
@endphp
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
|
@foreach($value as $k => $v)
|
||||||
|
@if($k=='luas_tanah')
|
||||||
|
@php
|
||||||
|
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@if($k=='luas_bangunan')
|
||||||
|
@php
|
||||||
|
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if (isset($luastanah) && isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luastanah))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah / Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
/
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_tanah))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah :
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -109,35 +109,41 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@php
|
@if($detail->details)
|
||||||
$details = json_decode($detail->details);
|
@php $luastanah = $luasbangunan = null; @endphp
|
||||||
@endphp
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
|
@foreach($value as $k => $v)
|
||||||
|
@if($k=='luas_tanah')
|
||||||
|
@php
|
||||||
|
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@if($k=='luas_bangunan')
|
||||||
|
@php
|
||||||
|
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if (isset($luastanah) && isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luastanah))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah / Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
/
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_tanah))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah :
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -124,35 +124,41 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@php
|
@if($detail->details)
|
||||||
$details = json_decode($detail->details);
|
@php $luastanah = $luasbangunan = null; @endphp
|
||||||
@endphp
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
|
@foreach($value as $k => $v)
|
||||||
|
@if($k=='luas_tanah')
|
||||||
|
@php
|
||||||
|
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@if($k=='luas_bangunan')
|
||||||
|
@php
|
||||||
|
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if (isset($luastanah) && isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luastanah))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah / Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
/
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_tanah))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah :
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -107,35 +107,41 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@php
|
@if($detail->details)
|
||||||
$details = json_decode($detail->details);
|
@php $luastanah = $luasbangunan = null; @endphp
|
||||||
@endphp
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
|
@foreach($value as $k => $v)
|
||||||
|
@if($k=='luas_tanah')
|
||||||
|
@php
|
||||||
|
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@if($k=='luas_bangunan')
|
||||||
|
@php
|
||||||
|
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if (isset($luastanah) && isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luastanah))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah / Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
/
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_tanah))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah :
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -126,35 +126,41 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@foreach ($permohonan->documents as $document)
|
@foreach ($permohonan->documents as $document)
|
||||||
@foreach ($document->detail as $detail)
|
@foreach ($document->detail as $index => $detail)
|
||||||
@php
|
@if($detail->details)
|
||||||
$details = json_decode($detail->details);
|
@php $luastanah = $luasbangunan = null; @endphp
|
||||||
@endphp
|
@foreach (json_decode($detail->details) as $key => $value)
|
||||||
|
@foreach($value as $k => $v)
|
||||||
|
@if($k=='luas_tanah')
|
||||||
|
@php
|
||||||
|
$luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@if($k=='luas_bangunan')
|
||||||
|
@php
|
||||||
|
$luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
|
||||||
|
@endphp
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@endforeach
|
||||||
|
|
||||||
|
@if (isset($luastanah) && isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luastanah))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Tanah : {{ $luastanah }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@elseif (isset($luasbangunan))
|
||||||
|
{{ $n }}. {{ $detail->name }}<br>
|
||||||
|
Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
|
||||||
|
<br>
|
||||||
|
@php $n++; @endphp
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (isset($details->luas_tanah) && isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah / Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
/
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_tanah))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Tanah :
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@elseif (isset($details->luas_bangunan))
|
|
||||||
{{ $n }}. {{ $detail->name }}<br>
|
|
||||||
Luas Bangunan:
|
|
||||||
{{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
|
|
||||||
m<sup>2</sup>
|
|
||||||
<br>
|
|
||||||
@php $n++; @endphp
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
Reference in New Issue
Block a user