diff --git a/src/web/WebApp.kt b/src/web/WebApp.kt
index 58d3b69..6bc6e0e 100644
--- a/src/web/WebApp.kt
+++ b/src/web/WebApp.kt
@@ -639,6 +639,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
                             // get timer list
                             it.result(MariaDB.ArrayListtoString(db.scheduleDB.List))
                         }
+
                         delete("List") {
                             // truncate timer table
                             if (db.scheduleDB.Clear()) {
@@ -649,7 +650,6 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
                             }
                         }
                         post("Add"){
-
                             // TODO add new schedule
                             // recheck lagi tambahan steph
                             val json: JsonNode = objectmapper.readTree(it.body())
@@ -683,7 +683,6 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
                                     } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid Time format, must be HH:mm")))
                                 } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid Day format")))
                             } else it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid Description")))
-
                         }
                         delete("DeleteByIndex/{index}") {
                             // delete by index
@@ -814,6 +813,17 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
                                 it.status(400).result(objectmapper.writeValueAsString(resultMessage("Invalid XLSX file")))
                             }
                         }
+
+                        //TODO kirim list message dan broadcast zones untuk ADD/Edit schedule
+                        get("GetMessageAndBroadcastZones") {
+                            val result = object {
+                                //TODO filter message without input variable
+                                val messages = db.messageDB.List
+
+                                val broadcastzones = db.broadcastDB.List
+                            }
+                            it.result(objectmapper.writeValueAsString(result))
+                        }
                     }
                     path("Log") {
                         get("List") { get1 ->