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

---
 ambil.php | 54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/ambil.php b/ambil.php
index b5d7a39..4229b52 100644
--- a/ambil.php
+++ b/ambil.php
@@ -27,7 +27,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // ==========================
     // DATA RUMAH IBADAH
     // ==========================
-    $sqlIbadah = "SELECT id, nama, latitude, longitude, radius FROM tabel_ibadah";
+    $sqlIbadah = "SELECT id, nama_ibadah, latitude, longitude, radius FROM tabel_ibadah";
 
     if (!$isAdmin && $userIbadahId > 0) {
         $sqlIbadah .= " WHERE id = $userIbadahId";
@@ -42,7 +42,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
             $res["ibadah"][] = [
                 "id"           => (int)$r['id'],
-                "nama_ibadah"  => $r['nama'],
+                "nama_ibadah"  => $r['nama_ibadah'],
                 "latitude"     => (float)$r['latitude'],
                 "longitude"    => (float)$r['longitude'],
                 "radius"       => (int)$r['radius']
@@ -50,35 +50,33 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         }
     }
 
-    // ==========================
-    // DATA PENDUDUK
-    // ==========================
-    $sqlPenduduk = "
-        SELECT
-            id,
-            nama,
-            latitude,
-            longitude,
-            status_warna,
-            status_bantuan
-        FROM tabel_penduduk
-    ";
+// ==========================
+// DATA PENDUDUK
+// ==========================
+$sqlPenduduk = "
+    SELECT
+        id,
+        nama_penduduk,
+        latitude,
+        longitude,
+        status_warna
+    FROM tabel_penduduk
+";
 
-    $qP = mysqli_query($conn, $sqlPenduduk);
+$qP = mysqli_query($conn, $sqlPenduduk);
 
-    if ($qP) {
-        while ($r = mysqli_fetch_assoc($qP)) {
+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']
-            ];
-        }
+        $res["penduduk"][] = [
+            "id"             => (int)$r['id'],
+            "nama_penduduk"  => $r['nama_penduduk'],
+            "latitude"       => (float)$r['latitude'],
+            "longitude"      => (float)$r['longitude'],
+            "status_warna"   => $r['status_warna']
+        ];
     }
+}
 
     echo json_encode($res);
     exit;
@@ -125,7 +123,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         $nama = mysqli_real_escape_string($conn, $_POST['nama_penduduk']);
         $lat  = (float)$_POST['latitude'];
         $lng  = (float)$_POST['longitude'];
-        $sql = "INSERT INTO tabel_penduduk (nama, latitude, longitude, status_warna) VALUES ('$nama', $lat, $lng, 'Merah', 'Belum')";
+        $sql = "INSERT INTO tabel_penduduk (nama_penduduk, latitude, longitude, status_warna) VALUES ('$nama', $lat, $lng, 'Merah', 'Belum')";
         if (mysqli_query($conn, $sql)) {
             echo json_encode(array("status" => "success", "message" => "Berhasil Simpan"));
         } else {