diff --git a/data/db.mv.db b/data/db.mv.db index f2a5f01..8fe3c2f 100644 Binary files a/data/db.mv.db and b/data/db.mv.db differ diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/controller/NewsController.java index 61cca27..3de7221 100644 --- a/src/main/java/ru/ulstu/controller/NewsController.java +++ b/src/main/java/ru/ulstu/controller/NewsController.java @@ -32,6 +32,12 @@ public class NewsController { return "editNews"; } + @GetMapping("/news/{newsId}") + public String viewNews(@PathVariable(value = "newsId") Integer id, Model model) { + model.addAttribute("news", id != null ? newsService.getById(id) : new News()); + return "news"; + } + @PostMapping("saveNews") public String saveNews(@Valid @ModelAttribute News news, BindingResult result) { if (result.hasErrors()) { @@ -41,4 +47,10 @@ public class NewsController { return "redirect:/"; } + + @GetMapping("deleteNews/{newsId}") + public String delete(@PathVariable(value = "newsId") Integer id) { + newsService.delete(id); + return "redirect:/"; + } } diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/model/News.java index af66265..f4dd2c8 100644 --- a/src/main/java/ru/ulstu/model/News.java +++ b/src/main/java/ru/ulstu/model/News.java @@ -1,5 +1,7 @@ package ru.ulstu.model; +import org.springframework.format.annotation.DateTimeFormat; + import javax.persistence.Entity; import javax.persistence.Lob; import javax.validation.constraints.NotEmpty; @@ -12,6 +14,7 @@ public class News extends BaseEntity { @NotEmpty(message = "Заголовок не может быть пустым") private String title; + @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm") private Date date; @Lob diff --git a/src/main/java/ru/ulstu/service/NewsService.java b/src/main/java/ru/ulstu/service/NewsService.java index a4bcae3..293d062 100644 --- a/src/main/java/ru/ulstu/service/NewsService.java +++ b/src/main/java/ru/ulstu/service/NewsService.java @@ -42,4 +42,8 @@ public class NewsService { public List getAll() { return newsRepository.findAll(); } + + public void delete(Integer id) { + newsRepository.deleteById(id); + } } diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css index b2b570d..359a34c 100644 --- a/src/main/resources/public/css/main.css +++ b/src/main/resources/public/css/main.css @@ -23,4 +23,12 @@ .error { color: red; +} + +.fa { + color: black; +} + +.link-dark, .link-dark:visited, .link-dark:focus { + color: black; } \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index b744d63..819bd2a 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -17,7 +17,7 @@ - +