Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

2025-03-07 11:09:16 +07:00
parent 575573f1ef b319abbabb
commit 224d830f89
27 changed files with 1354 additions and 1086 deletions
--- 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',