From 1b84ec133b09ae7a4d8e71f8e5a952ff5841bb1e Mon Sep 17 00:00:00 2001 From: stephaniegl Date: Thu, 16 Oct 2025 15:26:59 +0700 Subject: [PATCH] commit 14/10/2025 WebApp Add send language for ScheduleBank --- src/web/WebApp.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/web/WebApp.kt b/src/web/WebApp.kt index ab401d1..20f0e40 100644 --- a/src/web/WebApp.kt +++ b/src/web/WebApp.kt @@ -739,7 +739,8 @@ class WebApp(val listenPort: Int, val userlist: List>) { if (ValidString(description)){ if (ValidString(day) && ValidScheduleDay(day)){ if (ValidString(time) && ValidScheduleTime(time)){ - if (ValidString(soundpath) && ValidFile(soundpath)){ + //soundpath is a messagebank desc and aan_id + if (ValidString(soundpath)) { if (repeat in 0u..127u){ if (ValidString(broadcast_zones)){ val zones = broadcast_zones.split(";") @@ -904,8 +905,10 @@ class WebApp(val listenPort: Int, val userlist: List>) { //TODO add at js file for messagebank and broadcast zones values get("GetMessageAndBroadcastZones") { val result = object { - val messages = db.messageDB.List.filter { mb -> !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains("]") } - val broadcastzones = db.broadcastDB.List + val messages = db.messageDB.List + .filter { mb -> !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains("]")} + .map { mb -> "${mb.Description} [${mb.ANN_ID}]" } + val broadcastzones = db.broadcastDB.List.map { it.description } } it.result(objectmapper.writeValueAsString(result)) } @@ -913,7 +916,9 @@ class WebApp(val listenPort: Int, val userlist: List>) { // Kirim list language dari Messagebank berdasarkan ANN_ID get("GetLanguageList/{ANN_ID}") { get1 -> //kirim list language dari Messagebank - val langlist = db.messageDB.List.filter { it.ANN_ID == get1.pathParam("ANN_ID").toInt().toUInt() }.map { it.Language }.distinct() + val langlist = db.messageDB.List + .filter { it.ANN_ID == get1.pathParam("ANN_ID").toInt().toUInt() } + .map { it.Language }.distinct() get1.result(objectmapper.writeValueAsString(langlist)) } }