From adaa40eb3e547942f874a42bb90b66408abdfcab Mon Sep 17 00:00:00 2001
From: "Satrya.IY29" <d1041231025@student.untan.ac.id>
Date: Wed, 10 Jun 2026 06:56:42 +0000
Subject: [PATCH] Update ambil.php

---
 ambil.php | 90 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/ambil.php b/ambil.php
index d84c229..13631e9 100644
--- a/ambil.php
+++ b/ambil.php
@@ -3,60 +3,86 @@ error_reporting(E_ALL);
 ini_set('display_errors', 1);
 header('Content-Type: application/json; charset=UTF-8');
 
-include 'auth.php'; // Middleware auth
+include 'auth.php';
 include 'koneksi.php';
 
-
-
 if (!$conn) {
-    echo json_encode(array("status" => "error", "message" => "Gagal konek DB"));
+    echo json_encode([
+        "status" => "error",
+        "message" => "Gagal konek DB"
+    ]);
     exit;
 }
 
-
 $isAdmin = isAdminPemerintah();
 $userIbadahId = getUserIbadahId();
 
-
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-    $res = array("ibadah" => array(), "penduduk" => array());
-    
-    // Filter ibadah: admin pemerintah lihat semua, admin ibadah lihat miliknya saja
-    $sqlIbadah = "SELECT id, nama_ibadah, latitude, longitude, radius FROM tabel_ibadah";
+
+    $res = [
+        "ibadah" => [],
+        "penduduk" => []
+    ];
+
+    // ==========================
+    // DATA RUMAH IBADAH
+    // ==========================
+    $sqlIbadah = "SELECT id, nama, latitude, longitude, radius FROM tabel_ibadah";
+
     if (!$isAdmin && $userIbadahId > 0) {
         $sqlIbadah .= " WHERE id = $userIbadahId";
-    } else if (!$isAdmin) {
-        $sqlIbadah .= " WHERE id = 0"; // Jika tidak ada id_rumah_ibadah, jangan tampilkan apa-apa
+    } elseif (!$isAdmin) {
+        $sqlIbadah .= " WHERE id = 0";
     }
 
     $qI = mysqli_query($conn, $sqlIbadah);
-    if($qI){
-        while($r = mysqli_fetch_assoc($qI)) {
-            $res["ibadah"][] = array(
-                "id" => (int)$r['id'],
-                "nama_ibadah" => $r['nama_ibadah'],
-                "latitude" => (float)$r['latitude'],
-                "longitude" => (float)$r['longitude'],
-                "radius" => (int)$r['radius']
-            );
+
+    if ($qI) {
+        while ($r = mysqli_fetch_assoc($qI)) {
+
+            $res["ibadah"][] = [
+                "id"           => (int)$r['id'],
+                "nama_ibadah"  => $r['nama'],
+                "latitude"     => (float)$r['latitude'],
+                "longitude"    => (float)$r['longitude'],
+                "radius"       => (int)$r['radius']
+            ];
         }
     }
 
-    // Ambil data penduduk (termasuk status_bantuan)
-    $qP = mysqli_query($conn, "SELECT id, nama_penduduk, latitude, longitude, status_warna FROM tabel_penduduk");
-    if($qP){
-        while($r = mysqli_fetch_assoc($qP)) {
-            $res["penduduk"][] = array(
-                "id" => (int)$r['id'],
-                "nama_penduduk" => $r['nama_penduduk'],
-                "latitude" => (float)$r['latitude'],
-                "longitude" => (float)$r['longitude'],
-                "status_warna" => $r['status_warna']
-            );
+    // ==========================
+    // DATA PENDUDUK
+    // ==========================
+    $sqlPenduduk = "
+        SELECT
+            id,
+            nama,
+            latitude,
+            longitude,
+            status_warna,
+            status_bantuan
+        FROM tabel_penduduk
+    ";
+
+    $qP = mysqli_query($conn, $sqlPenduduk);
+
+    if ($qP) {
+        while ($r = mysqli_fetch_assoc($qP)) {
+
+            $res["penduduk"][] = [
+                "id"              => (int)$r['id'],
+                "nama_penduduk"   => $r['nama'],
+                "latitude"        => (float)$r['latitude'],
+                "longitude"       => (float)$r['longitude'],
+                "status_warna"    => $r['status_warna'],
+                "status_bantuan"  => $r['status_bantuan']
+            ];
         }
     }
+
     echo json_encode($res);
     exit;
+}
 
 }