diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php index f5e8371..3d02dc9 100644 --- a/resources/views/permohonan/form.blade.php +++ b/resources/views/permohonan/form.blade.php @@ -93,7 +93,7 @@ @if(isset($permohonan) && $permohonan->status == 'revisi')
Catatan :
- {{ $permohonan->keterangan }} + {{ $permohonan->keterangan }} {{ $permohonan->registrasi_catatan }}
@endif diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index 8e7a11a..82bc3cd 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -197,7 +197,17 @@ } }, 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: { title: 'Actions',