rdkartono/AAS_NewGeneration
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

commit 14/10/2025 WebApp Add send language for ScheduleBank

Browse Source
This commit is contained in:
stephaniegl
2025-10-15 13:32:08 +07:00
parent a53270aaed
commit 1563e233d6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/web/WebApp.kt
View File

@@ -23,7 +23,7 @@ import database.ScheduleBank
import database.SoundChannel import database.SoundChannel
import database.Soundbank import database.Soundbank
import database.UserDB import database.UserDB
>>>>>>>>> Temporary merge branch 2 //>>>>>>>>> Temporary merge branch 2
import db import db
import io.javalin.Javalin import io.javalin.Javalin
import io.javalin.apibuilder.ApiBuilder.before import io.javalin.apibuilder.ApiBuilder.before
@@ -40,6 +40,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook
import java.nio.file.Files import java.nio.file.Files
import java.time.LocalDateTime import java.time.LocalDateTime
@Suppress("unused") @Suppress("unused")
class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) { class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
@@ -738,6 +739,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
language language
) )
if (db.scheduleDB.Add(newvalue)){ if (db.scheduleDB.Add(newvalue)){
db.scheduleDB.Resort() db.scheduleDB.Resort()
it.result(objectmapper.writeValueAsString(resultMessage("OK"))) it.result(objectmapper.writeValueAsString(resultMessage("OK")))
} else it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to add schedule to database"))) } else it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to add schedule to database")))
@@ -884,7 +886,6 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
//TODO add at js file for messagebank and broadcast zones values //TODO add at js file for messagebank and broadcast zones values
get("GetMessageAndBroadcastZones") { get("GetMessageAndBroadcastZones") {
val result = object { val result = object {
//TODO filter message without input variable
val messages = db.messageDB.List.filter { mb -> !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains("]") } val messages = db.messageDB.List.filter { mb -> !mb.Message_Detail.contains("[") && !mb.Message_Detail.contains("]") }
val broadcastzones = db.broadcastDB.List val broadcastzones = db.broadcastDB.List
} }