daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-03-07 11:18:52 +07:00
parent 345cbbe22c b319abbabb
commit 426ca5ebb2
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/permohonan/form.blade.php
View File

@@ -93,7 +93,7 @@
@if(isset($permohonan) && $permohonan->status == 'revisi') @if(isset($permohonan) && $permohonan->status == 'revisi')
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
Catatan : <br> Catatan : <br>
<em class="text-red-500">{{ $permohonan->keterangan }}</em> <em class="text-red-500">{{ $permohonan->keterangan }} {{ $permohonan->registrasi_catatan }}</em>
</div> </div>
@endif @endif

12
resources/views/permohonan/index.blade.php
View File

@@ -197,7 +197,17 @@
} }
}, },
keterangan: { keterangan: {
title: 'Keterangan' title: 'Keterangan',
render : (item, data) => {
let keterangan = data.keterangan ?? ""
if(data.registrasi_catatan){
if(keterangan) keterangan += "\n";
keterangan += data.registrasi_catatan;
}
return keterangan
}
}, },
actions: { actions: {
title: 'Actions', title: 'Actions',