feat: docker setup and sync lejer am/imbang duga with kaunter (#1)
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
@@ -409,28 +409,16 @@
|
||||
|
||||
<table id="tarikh_ib">
|
||||
<tr>
|
||||
@php
|
||||
$api_url = request()->hostname;
|
||||
@endphp
|
||||
<td cospan="2" > <B><U>LAPORAN IMBANGAN DUGA CAWANGAN</U></B></td>
|
||||
|
||||
|
||||
@if(Str::contains($api_url, 'apiv3.arrahn'))
|
||||
<th colspan="5"><b>LAPORAN IMBANGAN DUGA CAWANGAN (arOSv3)</b></th>
|
||||
@else
|
||||
<th> </th>
|
||||
<td cospan="2" > <B><U>LAPORAN IMBANGAN DUGA CAWANGAN</U></B></td>
|
||||
@endif
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table id="tarikh_ib">
|
||||
|
||||
|
||||
<tr>
|
||||
<td style="width:20%; white-space: nowrap;"><b>Tarikh Laporan</b></td >
|
||||
<td style="width:20%; white-space: nowrap;"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td>
|
||||
<td style="width:150%; white-space: nowrap;"><b>Tarikh Cetak</b></td>
|
||||
<td style="width:20%; white-space: nowrap;"> {{$tarikh_cetak}} </td>
|
||||
</tr>
|
||||
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -323,15 +323,7 @@
|
||||
<br>
|
||||
|
||||
<table id="title">
|
||||
@php
|
||||
$api_url = request()->hostname;
|
||||
@endphp
|
||||
|
||||
@if(Str::contains($api_url, 'apiv3.arrahn'))
|
||||
<td> <b><u>LEJER AM (arOSv3)</u></b></td>
|
||||
@else
|
||||
<td> <b><u>LEJER AM</u></b></td>
|
||||
@endif
|
||||
<td> <b><u>LEJER AM</u></b></td>
|
||||
</table>
|
||||
<br>
|
||||
|
||||
@@ -339,19 +331,19 @@
|
||||
<div class="tarikhcetak">
|
||||
<span style="font-weight: bold;">[ TARIKH DARI : </span>
|
||||
<span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
|
||||
// $tarikhmula = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_mula)
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
|
||||
$tarikhmula = $myDateTime->format('d-m-Y');
|
||||
echo($tarikhmula)
|
||||
@endphp</span>
|
||||
<span style="font-weight: bold;"> ..... </span>
|
||||
<span style="font-weight: bold;">HINGGA : </span><span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
|
||||
// $tarikhakhir = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_akhir)
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
|
||||
$tarikhakhir = $myDateTime->format('d-m-Y');
|
||||
echo($tarikhakhir)
|
||||
@endphp<span style="font-weight:bold"> ]</span></span>
|
||||
<span style="margin-left:50px;font-weight: bold;">TARIKH CETAK : </span><span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
|
||||
// $tarikh_cetak = $myDateTime->format('d-m-Y');
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
|
||||
$tarikh_cetak = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_cetak)
|
||||
@endphp</span>
|
||||
</div>
|
||||
@@ -431,7 +423,7 @@
|
||||
|
||||
</table> --}}
|
||||
|
||||
{{-- <div style="margin-left:70px;">
|
||||
<div style="margin-left:70px;">
|
||||
<span class ="signature"><span style="margin-top:20px;">Disemak Oleh</span></span>
|
||||
<span class ="signature">Disahkan Oleh</span>
|
||||
</div> --}}
|
||||
</div>
|
||||
|
||||
@@ -301,16 +301,7 @@
|
||||
|
||||
|
||||
<table id="title">
|
||||
@php
|
||||
$api_url = request()->hostname;
|
||||
@endphp
|
||||
|
||||
@if(Str::contains($api_url, 'apiv3.arrahn'))
|
||||
<td> <b><u>LEJER AM (arOSv3) - {{ $cawangan_detail['namacaw'] }}</u></b></td>
|
||||
@else
|
||||
<td> <b><u>LEJER AM - {{ $cawangan_detail['namacaw'] }}</u></b></td>
|
||||
@endif
|
||||
|
||||
<td> <b><u>LEJER AM</u></b></td>
|
||||
</table>
|
||||
<br>
|
||||
|
||||
@@ -318,19 +309,19 @@
|
||||
<div class="tarikhcetak">
|
||||
<span style="font-weight: bold;">[ TARIKH DARI : </span>
|
||||
<span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
|
||||
// $tarikhmula = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_mula)
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
|
||||
$tarikhmula = $myDateTime->format('d-m-Y');
|
||||
echo($tarikhmula)
|
||||
@endphp</span>
|
||||
<span style="font-weight: bold;"> ..... </span>
|
||||
<span style="font-weight: bold;">HINGGA : </span><span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
|
||||
// $tarikhakhir = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_akhir)
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
|
||||
$tarikhakhir = $myDateTime->format('d-m-Y');
|
||||
echo($tarikhakhir)
|
||||
@endphp<span style="font-weight:bold"> ]</span></span>
|
||||
<span style="margin-left:50px;font-weight: bold;">TARIKH CETAK : </span><span>@php
|
||||
// $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
|
||||
// $tarikh_cetak = $myDateTime->format('d-m-Y');
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
|
||||
$tarikh_cetak = $myDateTime->format('d-m-Y');
|
||||
echo($tarikh_cetak)
|
||||
@endphp</span>
|
||||
</div>
|
||||
|
||||
@@ -164,7 +164,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
||||
// =====================
|
||||
// Fetch Cawangan API
|
||||
// =====================
|
||||
fetch("{{ config('api.url') }}/api/cawangan")
|
||||
fetch("{{ api_url_for_browser() }}/api/cawangan")
|
||||
.then(res => res.json())
|
||||
.then(data => {
|
||||
container.innerHTML = '';
|
||||
|
||||
Reference in New Issue
Block a user