diff --git a/src/web/WebApp.kt b/src/web/WebApp.kt index 5e3ba18..d58dc0d 100644 --- a/src/web/WebApp.kt +++ b/src/web/WebApp.kt @@ -23,7 +23,7 @@ import database.ScheduleBank import database.SoundChannel import database.Soundbank import database.UserDB ->>>>>>>>> Temporary merge branch 2 +//>>>>>>>>> Temporary merge branch 2 import db import io.javalin.Javalin import io.javalin.apibuilder.ApiBuilder.before @@ -40,6 +40,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook import java.nio.file.Files import java.time.LocalDateTime + @Suppress("unused") class WebApp(val listenPort: Int, val userlist: List>) { @@ -738,6 +739,7 @@ class WebApp(val listenPort: Int, val userlist: List>) { language ) if (db.scheduleDB.Add(newvalue)){ + db.scheduleDB.Resort() it.result(objectmapper.writeValueAsString(resultMessage("OK"))) } 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>) { //TODO add at js file for messagebank and broadcast zones values get("GetMessageAndBroadcastZones") { 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 broadcastzones = db.broadcastDB.List }