From 6199c3acc6ec8ee7f2a9a162052b479de5978838 Mon Sep 17 00:00:00 2001 From: alterdekim Date: Wed, 27 Nov 2024 22:30:04 +0300 Subject: [PATCH] Theme edit_entry functionality x2 --- .../controller/DatabaseController.java | 104 +++++++++++++++++- .../javabot/repository/BioRepository.java | 7 ++ .../repository/DisasterRepository.java | 7 ++ .../javabot/repository/HealthRepository.java | 8 ++ .../javabot/repository/HobbyRepository.java | 7 ++ .../javabot/repository/LuggageRepository.java | 7 ++ .../javabot/repository/WorkRepository.java | 7 ++ .../javabot/service/BioService.java | 2 + .../javabot/service/BioServiceImpl.java | 5 + .../javabot/service/DisasterService.java | 2 + .../javabot/service/DisasterServiceImpl.java | 5 + .../javabot/service/HealthService.java | 2 + .../javabot/service/HealthServiceImpl.java | 5 + .../javabot/service/HobbyService.java | 2 + .../javabot/service/HobbyServiceImpl.java | 5 + .../javabot/service/LuggageService.java | 2 + .../javabot/service/LuggageServiceImpl.java | 5 + .../javabot/service/WorkService.java | 2 + .../javabot/service/WorkServiceImpl.java | 7 ++ .../static/javascript/panel-script.js | 3 +- 20 files changed, 191 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java index dfeaa7a..566d0ab 100644 --- a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java +++ b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java @@ -43,6 +43,16 @@ public class DatabaseController { bioService.saveBio(new Bio(ismale, isfemale, canDie, t.getId(), themeId)); } + private void editGender(Long id, Map params) { + Boolean canDie = Boolean.parseBoolean(params.get("canDie")); + Boolean ismale = Boolean.parseBoolean(params.get("ismale")); + Boolean isfemale = Boolean.parseBoolean(params.get("isfemale")); + String gender_text = new String(HashUtils.decodeHexString(params.get("gender_text"))); + TextDataVal t = textDataValService.save(new TextDataVal(gender_text)); + Long themeId = Long.parseLong(params.get("object_selected_theme")); + bioService.updateBio(id, ismale, isfemale, canDie, t.getId(), themeId); + } + private void saveHobby(Map params) { Float powerRange = Float.parseFloat(params.get("powerRange")); Float violenceRange = Float.parseFloat(params.get("violenceRange")); @@ -56,6 +66,19 @@ public class DatabaseController { hobbyService.saveHobby(new Hobby(foodRange, powerRange, violenceRange, healRange, t.getId(), themeId)); } + private void editHobby(Long id, Map params) { + Float powerRange = Float.parseFloat(params.get("powerRange")); + Float violenceRange = Float.parseFloat(params.get("violenceRange")); + Float healRange = Float.parseFloat(params.get("healRange")); + Float foodRange = Float.parseFloat(params.get("foodRange")); + String hobby_text = new String(HashUtils.decodeHexString(params.get("hobby_text"))); + TextDataVal t = textDataValService.save(new TextDataVal(hobby_text)); + + Long themeId = Long.parseLong(params.get("object_selected_theme")); + + hobbyService.updateHobby(id, foodRange, powerRange, violenceRange, healRange, t.getId(), themeId); + } + private void saveLuggage(Map params) { Float powerRange = Float.parseFloat(params.get("powerRange")); Float violenceRange = Float.parseFloat(params.get("violenceRange")); @@ -74,6 +97,24 @@ public class DatabaseController { luggageService.saveLuggage(new Luggage(violenceRange, powerRange, healRange, foodRange, isGarbage, t1.getId(), t2.getId(), themeId)); } + private void editLuggage(Long id, Map params) { + Float powerRange = Float.parseFloat(params.get("powerRange")); + Float violenceRange = Float.parseFloat(params.get("violenceRange")); + Float healRange = Float.parseFloat(params.get("healRange")); + Float foodRange = Float.parseFloat(params.get("foodRange")); + Boolean isGarbage = Boolean.parseBoolean(params.get("isgarbage")); + + String name_text = new String(HashUtils.decodeHexString(params.get("luggage_name_text"))); + TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); + + String desc_text = new String(HashUtils.decodeHexString(params.get("luggage_desc_text"))); + TextDataVal t2 = textDataValService.save(new TextDataVal(desc_text)); + + Long themeId = Long.parseLong(params.get("object_selected_theme")); + + luggageService.updateLuggage(id, violenceRange, powerRange, healRange, foodRange, isGarbage, t1.getId(), t2.getId(), themeId); + } + private void saveHealth(Map params) { Float health_index = Float.parseFloat(params.get("health_index")); Boolean childFree = Boolean.parseBoolean(params.get("childFree")); @@ -88,6 +129,20 @@ public class DatabaseController { healthService.saveHealth(new Health(health_index, t1.getId(), t2.getId(), childFree, themeId)); } + private void editHealth(Long id, Map params) { + Float health_index = Float.parseFloat(params.get("health_index")); + Boolean childFree = Boolean.parseBoolean(params.get("childFree")); + String name_text = new String(HashUtils.decodeHexString(params.get("heal_name_text"))); + TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); + + String desc_text = new String(HashUtils.decodeHexString(params.get("heal_desc_text"))); + TextDataVal t2 = textDataValService.save(new TextDataVal(desc_text)); + + Long themeId = Long.parseLong(params.get("object_selected_theme")); + + healthService.updateHealth(id, health_index, t1.getId(), t2.getId(), childFree, themeId); + } + private void saveTheme(Map params) { String name_text = new String(HashUtils.decodeHexString(params.get("theme_name_text"))); TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); @@ -111,6 +166,23 @@ public class DatabaseController { workService.saveWork(new Work(healRange, powerRange, violenceRange, foodRange, t1.getId(), t2.getId(), themeId)); } + private void editWork(Long id, Map params) { + Float powerRange = Float.parseFloat(params.get("powerRange")); + Float violenceRange = Float.parseFloat(params.get("violenceRange")); + Float healRange = Float.parseFloat(params.get("healRange")); + Float foodRange = Float.parseFloat(params.get("foodRange")); + + String name_text = new String(HashUtils.decodeHexString(params.get("work_name_text"))); + TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); + + String desc_text = new String(HashUtils.decodeHexString(params.get("work_desc_text"))); + TextDataVal t2 = textDataValService.save(new TextDataVal(desc_text)); + + Long themeId = Long.parseLong(params.get("object_selected_theme")); + + workService.updateWork(id, healRange, powerRange, violenceRange, foodRange, t1.getId(), t2.getId(), themeId); + } + private void saveDiss(Map params) { String name_text = new String(HashUtils.decodeHexString(params.get("diss_name_text"))); TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); @@ -123,6 +195,18 @@ public class DatabaseController { disasterService.saveDisaster(new Disaster(t1.getId(), t2.getId(), themeId)); } + private void editDiss(Long id, Map params) { + String name_text = new String(HashUtils.decodeHexString(params.get("diss_name_text"))); + TextDataVal t1 = textDataValService.save(new TextDataVal(name_text)); + + String desc_text = new String(HashUtils.decodeHexString(params.get("diss_desc_text"))); + TextDataVal t2 = textDataValService.save(new TextDataVal(desc_text)); + + Long themeId = Long.parseLong(params.get("object_selected_theme")); + + disasterService.updateDisaster(id, t1.getId(), t2.getId(), themeId); + } + private void saveAction(Map params) { String scriptBody = params.get("action_body_text"); String name_text = new String(HashUtils.decodeHexString(params.get("action_name_text"))); @@ -280,8 +364,8 @@ public class DatabaseController { return "error"; } - @PostMapping("/api/edit_entry") - public String edit_entry(@RequestParam Map params) { + @PostMapping("/api/get_entry") + public String get_entry(@RequestParam Map params) { ObjectMapper mapper = new ObjectMapper(); long l = Long.parseLong(params.get("entry_id")); try { @@ -301,6 +385,22 @@ public class DatabaseController { return "error"; } + @PostMapping("/api/edit_entry") + public String edit_entry(@RequestParam Map params) { + long l = Long.parseLong(params.get("entry_id")); + String section = params.get("section"); + switch (section) { + case "agge" -> editGender(l, params); + case "lugg" -> editLuggage(l, params); + case "prof" -> editWork(l, params); + case "heal" -> editHealth(l, params); + case "hobb" -> editHobby(l, params); + case "diss" -> editDiss(l, params); + default -> log.error("Unknown section"); + } + return "ok"; + } + @PostMapping("/api/set_theme") public String set_theme(@RequestParam Map params) { long theme_id = Long.parseLong(params.get("theme_id")); diff --git a/src/main/java/com/alterdekim/javabot/repository/BioRepository.java b/src/main/java/com/alterdekim/javabot/repository/BioRepository.java index 3a1088d..2aea664 100644 --- a/src/main/java/com/alterdekim/javabot/repository/BioRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/BioRepository.java @@ -4,8 +4,10 @@ import com.alterdekim.javabot.entities.Bio; import com.alterdekim.javabot.entities.Disaster; import com.alterdekim.javabot.entities.Synergy; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -20,4 +22,9 @@ public interface BioRepository extends JpaRepository { @Query("SELECT b FROM Bio b WHERE b.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + @Modifying + @Transactional + @Query("UPDATE Bio b SET b.isMale = :isMale, b.isFemale = :isFemale, b.canDie = :canDie, b.genderTextId = :nameId, b.theme = :themeId WHERE b.id = :uuid") + void updateBio(@Param("uuid") Long id, @Param("isMale") Boolean isMale, @Param("isFemale") Boolean isFemale, @Param("canDie") Boolean canDie, @Param("nameId") Long nameId, @Param("themeId") Long themeId); } \ No newline at end of file diff --git a/src/main/java/com/alterdekim/javabot/repository/DisasterRepository.java b/src/main/java/com/alterdekim/javabot/repository/DisasterRepository.java index 5339b25..8373e84 100644 --- a/src/main/java/com/alterdekim/javabot/repository/DisasterRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/DisasterRepository.java @@ -2,8 +2,10 @@ package com.alterdekim.javabot.repository; import com.alterdekim.javabot.entities.Disaster; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -15,4 +17,9 @@ public interface DisasterRepository extends JpaRepository { @Query("SELECT d FROM Disaster d WHERE d.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + @Transactional + @Modifying + @Query("UPDATE Disaster d SET d.nameTextId = :nameTextId, d.descTextId = :descTextId, d.theme = :theme WHERE d.id = :uuid") + void updateDisaster(@Param("uuid") Long id, Long nameTextId, Long descTextId, Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/repository/HealthRepository.java b/src/main/java/com/alterdekim/javabot/repository/HealthRepository.java index 8edbad2..03cc7bb 100644 --- a/src/main/java/com/alterdekim/javabot/repository/HealthRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/HealthRepository.java @@ -4,8 +4,10 @@ import com.alterdekim.javabot.entities.Health; import com.alterdekim.javabot.entities.Synergy; import com.alterdekim.javabot.entities.Work; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -20,4 +22,10 @@ public interface HealthRepository extends JpaRepository { @Query("SELECT h FROM Health h WHERE h.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + + @Modifying + @Transactional + @Query("UPDATE Health h SET h.health_index = :health_index, h.textNameId = :textNameId, h.textDescId = :textDescId, h.isChildfree = :isChildfree, h.theme = :theme WHERE h.id = :uuid") + void updateHealth(@Param("uuid") Long id, @Param("health_index") Float health_index, @Param("textNameId") Long textNameId, @Param("textDescId") Long textDescId, @Param("isChildfree") Boolean isChildfree, @Param("theme") Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/repository/HobbyRepository.java b/src/main/java/com/alterdekim/javabot/repository/HobbyRepository.java index 3a40a18..b31949b 100644 --- a/src/main/java/com/alterdekim/javabot/repository/HobbyRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/HobbyRepository.java @@ -4,8 +4,10 @@ import com.alterdekim.javabot.entities.Health; import com.alterdekim.javabot.entities.Hobby; import com.alterdekim.javabot.entities.Synergy; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -20,4 +22,9 @@ public interface HobbyRepository extends JpaRepository { @Query("SELECT h FROM Hobby h WHERE h.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + @Modifying + @Transactional + @Query("UPDATE Hobby h SET h.foodstuffs = :foodstuffs, h.power = :power, h.violence = :violence, h.asocial = :asocial, h.textDescId = :nameId, h.theme = :themeId WHERE h.id = :uuid") + void updateHobby(@Param("uuid") Long id, @Param("foodstuffs") Float foodstuffs, @Param("power") Float power, @Param("violence") Float violence, @Param("asocial") Float asocial, Long nameId, Long themeId); } diff --git a/src/main/java/com/alterdekim/javabot/repository/LuggageRepository.java b/src/main/java/com/alterdekim/javabot/repository/LuggageRepository.java index 202d842..f5dd765 100644 --- a/src/main/java/com/alterdekim/javabot/repository/LuggageRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/LuggageRepository.java @@ -4,8 +4,10 @@ import com.alterdekim.javabot.entities.Hobby; import com.alterdekim.javabot.entities.Luggage; import com.alterdekim.javabot.entities.Synergy; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -20,4 +22,9 @@ public interface LuggageRepository extends JpaRepository { @Query("SELECT l FROM Luggage l WHERE l.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + @Modifying + @Transactional + @Query("UPDATE Luggage l SET l.violence = :violence, l.power = :power, l.asocial = :asocial, l.foodstuffs = :foodstuffs, l.garbage = :garbage, l.textNameId = :textNameId, l.textDescId = :textDescId, l.theme = :theme WHERE l.id = :uuid") + void updateLuggage(@Param("uuid") Long id, @Param("violence") Float violence, @Param("power") Float power, @Param("asocial") Float asocial, @Param("foodstuffs") Float foodstuffs, @Param("garbage") Boolean garbage, @Param("textNameId") Long textNameId, @Param("textDescId") Long textDescId, @Param("theme") Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/repository/WorkRepository.java b/src/main/java/com/alterdekim/javabot/repository/WorkRepository.java index 1466754..838d7fd 100644 --- a/src/main/java/com/alterdekim/javabot/repository/WorkRepository.java +++ b/src/main/java/com/alterdekim/javabot/repository/WorkRepository.java @@ -4,8 +4,10 @@ import com.alterdekim.javabot.entities.Disaster; import com.alterdekim.javabot.entities.Synergy; import com.alterdekim.javabot.entities.Work; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -20,4 +22,9 @@ public interface WorkRepository extends JpaRepository { @Query("SELECT w FROM Work w WHERE w.theme = :th") List findByTheme(@Param(value = "th") Long theme); + + @Modifying + @Transactional + @Query("UPDATE Work w SET w.asocial = :asocial, w.power = :power, w.violence = :violence, w.foodstuffs = :foodstuffs, w.textNameId = :textNameId, w.textDescId = :textDescId, w.theme = :theme WHERE w.id = :uuid") + void updateWork(@Param("uuid") Long id, @Param("asocial") Float asocial, @Param("power") Float power, @Param("violence") Float violence, @Param("foodstuffs") Float foodstuffs, @Param("textNameId") Long textNameId, @Param("textDescId") Long textDescId, @Param("theme") Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/service/BioService.java b/src/main/java/com/alterdekim/javabot/service/BioService.java index 87e0c37..ce160dd 100644 --- a/src/main/java/com/alterdekim/javabot/service/BioService.java +++ b/src/main/java/com/alterdekim/javabot/service/BioService.java @@ -14,4 +14,6 @@ public interface BioService { void removeById(Long id); List getSynergies(Long id); + + void updateBio(Long id, Boolean isMale, Boolean isFemale, Boolean canDie, Long nameId, Long themeId); } diff --git a/src/main/java/com/alterdekim/javabot/service/BioServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/BioServiceImpl.java index b78d037..cc1ee4a 100644 --- a/src/main/java/com/alterdekim/javabot/service/BioServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/BioServiceImpl.java @@ -51,4 +51,9 @@ public class BioServiceImpl implements BioService { public List getSynergies(Long id) { return repository.getSynergies(id); } + + @Override + public void updateBio(Long id, Boolean isMale, Boolean isFemale, Boolean canDie, Long nameId, Long themeId) { + repository.updateBio(id, isMale, isFemale, canDie, nameId, themeId); + } } diff --git a/src/main/java/com/alterdekim/javabot/service/DisasterService.java b/src/main/java/com/alterdekim/javabot/service/DisasterService.java index 0db270f..b1713a6 100644 --- a/src/main/java/com/alterdekim/javabot/service/DisasterService.java +++ b/src/main/java/com/alterdekim/javabot/service/DisasterService.java @@ -11,4 +11,6 @@ public interface DisasterService { void removeById(long dId); void saveDisaster(Disaster disaster); + + void updateDisaster(Long id, Long nameTextId, Long descTextId, Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/service/DisasterServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/DisasterServiceImpl.java index 02bd26e..3939dc5 100644 --- a/src/main/java/com/alterdekim/javabot/service/DisasterServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/DisasterServiceImpl.java @@ -44,4 +44,9 @@ public class DisasterServiceImpl implements DisasterService { public void saveDisaster(Disaster disaster) { repository.save(disaster); } + + @Override + public void updateDisaster(Long id, Long nameTextId, Long descTextId, Long theme) { + repository.updateDisaster(id, nameTextId, descTextId, theme); + } } diff --git a/src/main/java/com/alterdekim/javabot/service/HealthService.java b/src/main/java/com/alterdekim/javabot/service/HealthService.java index 299e6a0..d4150f4 100644 --- a/src/main/java/com/alterdekim/javabot/service/HealthService.java +++ b/src/main/java/com/alterdekim/javabot/service/HealthService.java @@ -14,4 +14,6 @@ public interface HealthService { void saveHealth(Health health); List getSynergies(Long id); + + void updateHealth(Long id, Float health_index, Long textNameId, Long textDescId, Boolean isChildfree, Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/service/HealthServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/HealthServiceImpl.java index 2ea1728..dc49c68 100644 --- a/src/main/java/com/alterdekim/javabot/service/HealthServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/HealthServiceImpl.java @@ -51,4 +51,9 @@ public class HealthServiceImpl implements HealthService { public List getSynergies(Long id) { return repository.getSynergies(id); } + + @Override + public void updateHealth(Long id, Float health_index, Long textNameId, Long textDescId, Boolean isChildfree, Long theme) { + repository.updateHealth(id, health_index, textNameId, textDescId, isChildfree, theme); + } } diff --git a/src/main/java/com/alterdekim/javabot/service/HobbyService.java b/src/main/java/com/alterdekim/javabot/service/HobbyService.java index 9fa0a92..53d566b 100644 --- a/src/main/java/com/alterdekim/javabot/service/HobbyService.java +++ b/src/main/java/com/alterdekim/javabot/service/HobbyService.java @@ -14,4 +14,6 @@ public interface HobbyService { void removeById(Long id); List getSynergies(Long id); + + void updateHobby(Long id, Float foodRange, Float powerRange, Float violenceRange, Float healRange, Long nameId, Long themeId); } diff --git a/src/main/java/com/alterdekim/javabot/service/HobbyServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/HobbyServiceImpl.java index de13509..1e98b19 100644 --- a/src/main/java/com/alterdekim/javabot/service/HobbyServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/HobbyServiceImpl.java @@ -51,4 +51,9 @@ public class HobbyServiceImpl implements HobbyService { public List getSynergies(Long id) { return repository.getSynergies(id); } + + @Override + public void updateHobby(Long id, Float foodRange, Float powerRange, Float violenceRange, Float healRange, Long nameId, Long themeId) { + repository.updateHobby(id, foodRange, powerRange, violenceRange, healRange, nameId, themeId); + } } diff --git a/src/main/java/com/alterdekim/javabot/service/LuggageService.java b/src/main/java/com/alterdekim/javabot/service/LuggageService.java index 25a9e55..1dde329 100644 --- a/src/main/java/com/alterdekim/javabot/service/LuggageService.java +++ b/src/main/java/com/alterdekim/javabot/service/LuggageService.java @@ -14,4 +14,6 @@ public interface LuggageService { void saveLuggage(Luggage luggage); List getSynergies(Long id); + + void updateLuggage(Long id, Float violence, Float power, Float asocial, Float foodstuffs, Boolean garbage, Long textNameId, Long textDescId, Long theme); } diff --git a/src/main/java/com/alterdekim/javabot/service/LuggageServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/LuggageServiceImpl.java index f26ac8b..c01d939 100644 --- a/src/main/java/com/alterdekim/javabot/service/LuggageServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/LuggageServiceImpl.java @@ -49,4 +49,9 @@ public class LuggageServiceImpl implements LuggageService { public List getSynergies(Long id) { return repository.getSynergies(id); } + + @Override + public void updateLuggage(Long id, Float violence, Float power, Float asocial, Float foodstuffs, Boolean garbage, Long textNameId, Long textDescId, Long theme) { + repository.updateLuggage(id, violence, power, asocial, foodstuffs, garbage, textNameId, textDescId, theme); + } } diff --git a/src/main/java/com/alterdekim/javabot/service/WorkService.java b/src/main/java/com/alterdekim/javabot/service/WorkService.java index 9c7cd04..2e61c95 100644 --- a/src/main/java/com/alterdekim/javabot/service/WorkService.java +++ b/src/main/java/com/alterdekim/javabot/service/WorkService.java @@ -14,4 +14,6 @@ public interface WorkService { void saveWork(Work work); List getSynergies(Long id); + + void updateWork(Long id, Float asocial, Float power, Float violence, Float foodstuffs, Long textNameId, Long textDescId, Long theme); } \ No newline at end of file diff --git a/src/main/java/com/alterdekim/javabot/service/WorkServiceImpl.java b/src/main/java/com/alterdekim/javabot/service/WorkServiceImpl.java index 7e33560..1bec752 100644 --- a/src/main/java/com/alterdekim/javabot/service/WorkServiceImpl.java +++ b/src/main/java/com/alterdekim/javabot/service/WorkServiceImpl.java @@ -51,4 +51,11 @@ public class WorkServiceImpl implements WorkService { public List getSynergies(Long id) { return repository.getSynergies(id); } + + @Override + public void updateWork(Long id, Float asocial, Float power, Float violence, Float foodstuffs, Long textNameId, Long textDescId, Long theme) { + repository.updateWork(id, asocial, power, violence, foodstuffs, textNameId, textDescId, theme); + } + + } diff --git a/src/main/resources/static/javascript/panel-script.js b/src/main/resources/static/javascript/panel-script.js index 195355a..805666a 100644 --- a/src/main/resources/static/javascript/panel-script.js +++ b/src/main/resources/static/javascript/panel-script.js @@ -147,6 +147,7 @@ function show_modal_edit(jobj, oid) { } function edit_submit_entry(obj) { + // TODO: change this $.post("/api/remove_entry", "section="+new URL(window.location.href).searchParams.get("section")+"&entry_id="+($(obj).attr("data-entry-id")), function(data, status) { add_entry(); }); @@ -157,7 +158,7 @@ function edit_entry(obj) { if( __ss == "actions" ) { window.location.href = "/script-editor?script_id=" + ($(obj).attr("data-id")); } else { - $.post("/api/edit_entry", "section="+__ss+"&entry_id="+($(obj).attr("data-id")), function(data, status) { + $.post("/api/get_entry", "section="+__ss+"&entry_id="+($(obj).attr("data-id")), function(data, status) { var jobj = JSON.parse(data); show_modal_edit(jobj, $(obj).attr("data-id")); });