From 2712fa915e72ae2bc12998c69ff59e97ffb0eda0 Mon Sep 17 00:00:00 2001 From: alterdekim Date: Mon, 8 Jul 2024 04:26:38 +0300 Subject: [PATCH] request accept/remove added --- .../controller/DatabaseController.java | 15 ++++++++++++ src/main/resources/messages_en.properties | 3 ++- src/main/resources/messages_ru.properties | 3 ++- .../static/javascript/panel-script.js | 6 +++++ src/main/resources/templates/panel.html | 24 ++++++++++++++----- 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java index c099715..b566974 100644 --- a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java +++ b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java @@ -196,6 +196,20 @@ public class DatabaseController { return "ok"; } + @PostMapping("/api/accept_script_request") + public String accept_script_request(@RequestParam Map params) { + long entry_id = Long.parseLong(params.get("entry_id")); + ActionScriptRequest req = actionRequestService.getActionScriptById(entry_id); + String scriptBody = req.getScriptBody(); + String name_text = req.getTextName(); + TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); + String desc_text = req.getTextDesc(); + TextDataVal t2 = textDataValService.save(new TextDataVal(desc_text)); + actionService.saveScript(new ActionScript(t1.getId(), t2.getId(), scriptBody)); + actionRequestService.removeById(entry_id); + return "ok"; + } + @PostMapping("/public/api/add_entry_request") public String add_entry_request(@RequestParam Map params) { saveActionRequest(params); @@ -213,6 +227,7 @@ public class DatabaseController { case "heal" -> healthService.removeById(entry_id); case "prof" -> workService.removeById(entry_id); case "actions" -> actionService.removeById(entry_id); + case "script_request" -> actionRequestService.removeById(entry_id); default -> disasterService.removeById(entry_id); } return "ok"; diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 4c01a2f..128bd17 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -68,4 +68,5 @@ scrieditti=Script editor scrieditde=Below you can write a script for Bunker's action card. On the left side you will find code snippets, that will help with it. Happy coding! edditaddbtn=Edit/Add edditreq=Send request -scrireqq=Script requests \ No newline at end of file +scrireqq=Script requests +acceptbtnreq=Accept \ No newline at end of file diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties index a8b34ef..79761b5 100644 --- a/src/main/resources/messages_ru.properties +++ b/src/main/resources/messages_ru.properties @@ -68,4 +68,5 @@ scrieditti=Редактор скриптов (карточек действий) scrieditde=Ниже в вашем распоряжении редактор скриптов для карт действий игры Бункер. Слева вы найдете готовые куски кода, которые вам помогут. Удачи! edditaddbtn=Изменить/Добавить edditreq=Отправить запрос -scrireqq=Запросы на скрипты \ No newline at end of file +scrireqq=Запросы на скрипты +acceptbtnreq=Принять \ No newline at end of file diff --git a/src/main/resources/static/javascript/panel-script.js b/src/main/resources/static/javascript/panel-script.js index c0b2817..073474f 100644 --- a/src/main/resources/static/javascript/panel-script.js +++ b/src/main/resources/static/javascript/panel-script.js @@ -170,6 +170,12 @@ function get_text_api(tid, cb) { }); } +function accept_script_request(obj) { + $.post("/api/accept_script_request", "entry_id="+($(obj).attr("data-id")), function(data, status) { + window.location.reload(); + }); +} + function remove_entry(obj) { $.post("/api/remove_entry", "section="+new URL(window.location.href).searchParams.get("section")+"&entry_id="+($(obj).attr("data-id")), function(data, status) { window.location.reload(); diff --git a/src/main/resources/templates/panel.html b/src/main/resources/templates/panel.html index 3c0476f..813f131 100644 --- a/src/main/resources/templates/panel.html +++ b/src/main/resources/templates/panel.html @@ -86,9 +86,15 @@

  • - - - + + + + + + + + + @@ -117,9 +123,15 @@

  • - - - + + + + + + + + +