commit 20/10/2025
TODO Schedule belum beres
This commit is contained in:
@@ -319,6 +319,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.soundDB.DeleteByIndex(index.toInt())) {
|
||||
db.soundDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS","Deleted sound bank with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete soundbank with index $index")))
|
||||
}
|
||||
@@ -490,6 +491,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.messageDB.DeleteByIndex(index.toInt())) {
|
||||
db.messageDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS","Deleted message bank with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete messagebank with index $index")))
|
||||
}
|
||||
@@ -645,6 +647,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.languageDB.DeleteByIndex(index.toInt())) {
|
||||
db.languageDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS","Deleted language link with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete language link with index $index")))
|
||||
}
|
||||
@@ -736,8 +739,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())
|
||||
val description = json.get("Description")?.asText("") ?: ""
|
||||
val day = json.get("Day")?.asText("") ?: ""
|
||||
@@ -747,15 +748,16 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
val enable = json.get("Enable")?.asBoolean() ?: false
|
||||
val broadcast_zones = json.get("BroadcastZones")?.asText("") ?: ""
|
||||
val language = json.get("Language")?.asText("") ?: ""
|
||||
println("Add ScheduleBank, description=$description, day=$day, time=$time, soundpath=$soundpath, repeat=$repeat, enable=$enable, broadcast_zones=$broadcast_zones, language=$language")
|
||||
if (ValidString(description)){
|
||||
if (ValidString(day) && ValidScheduleDay(day)){
|
||||
if (ValidString(time) && ValidScheduleTime(time)){
|
||||
if (ValidString(soundpath) && ValidFile(soundpath)){
|
||||
if (ValidScheduleDay(day)){
|
||||
if (ValidScheduleTime(time)){
|
||||
if (ValidString(soundpath)){
|
||||
if (repeat in 0u..127u){
|
||||
if (ValidString(broadcast_zones)){
|
||||
val zones = broadcast_zones.split(";")
|
||||
if (zones.all { zz -> db.broadcastDB.List.any { xx -> xx.description.equals(zz,true) } }){
|
||||
if (ValidString(language) && Language.entries.any{ lang -> lang.name == language }){
|
||||
if (ValidString(language)){
|
||||
val newvalue = ScheduleBank(
|
||||
0u,
|
||||
description,
|
||||
@@ -789,6 +791,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.scheduleDB.DeleteByIndex(index.toInt())) {
|
||||
db.scheduleDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS","Deleted schedule bank with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete schedule with index $index")))
|
||||
}
|
||||
@@ -911,6 +914,24 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
.result(objectmapper.writeValueAsString(resultMessage("Invalid XLSX file")))
|
||||
}
|
||||
}
|
||||
get("GetMessageAndBroadcastZones") {
|
||||
val result = object {
|
||||
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
|
||||
}
|
||||
it.result(objectmapper.writeValueAsString(result))
|
||||
}
|
||||
|
||||
// Kirim list language dari Messagebank berdasarkan ANN_ID
|
||||
get("GetLanguageList/{ANN_ID}") { get1 ->
|
||||
val langlist = db.messageDB.List
|
||||
.filter { it.ANN_ID == get1.pathParam("ANN_ID").toInt().toUInt() }
|
||||
.map { it.Language }.distinct()
|
||||
get1.result(objectmapper.writeValueAsString(langlist))
|
||||
}
|
||||
|
||||
}
|
||||
path("UserManagement") {
|
||||
get("List") {
|
||||
@@ -988,6 +1009,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.userDB.DeleteByIndex(index.toInt())) {
|
||||
db.userDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS", "Deleted user with index $index")
|
||||
} else it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete user with index $index")))
|
||||
}
|
||||
}
|
||||
@@ -1078,12 +1100,9 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
}
|
||||
}
|
||||
|
||||
//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))
|
||||
@@ -1183,6 +1202,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.broadcastDB.DeleteByIndex(index.toInt())) {
|
||||
db.broadcastDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS","Deleted broadcast zone with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete broadcast zone with index $index")))
|
||||
}
|
||||
@@ -1387,7 +1407,6 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
}
|
||||
}
|
||||
|
||||
// Steph : coba tambah untuk QueuePaging Table. Belum ada di JS file(?)
|
||||
path("QueuePaging"){
|
||||
get("List"){
|
||||
it.result(MariaDB.ArrayListtoString(db.queuepagingDB.List))
|
||||
@@ -1410,6 +1429,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.queuepagingDB.DeleteByIndex(index.toInt())) {
|
||||
db.queuepagingDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS", "Deleted queue paging with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete queue paging with index $index")))
|
||||
}
|
||||
@@ -1419,7 +1439,6 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
}
|
||||
|
||||
|
||||
// Steph : coba tambah untuk QueueTable Table. Belum ada di JS file(?)
|
||||
path("QueueTable"){
|
||||
get("List"){
|
||||
it.result(MariaDB.ArrayListtoString(db.queuetableDB.List))
|
||||
@@ -1442,6 +1461,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
if (db.queuetableDB.DeleteByIndex(index.toInt())) {
|
||||
db.queuetableDB.Resort()
|
||||
it.result(objectmapper.writeValueAsString(resultMessage("OK")))
|
||||
db.Add_Log("AAS", "Deleted queue sound with index $index")
|
||||
} else {
|
||||
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to delete queue sound with index $index")))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user