diff --git a/src/main/java/ru/ulstu/students/controller/TaskController.java b/src/main/java/ru/ulstu/students/controller/TaskController.java index e231d39..f6eefc7 100644 --- a/src/main/java/ru/ulstu/students/controller/TaskController.java +++ b/src/main/java/ru/ulstu/students/controller/TaskController.java @@ -41,6 +41,15 @@ public class TaskController { modelMap.put("filteredTasks", new TaskFilterDto(taskService.findAllDto(), null, null)); } + @GetMapping("/task") + public void getTask(ModelMap modelMap, @RequestParam(value = "id") Integer id) { + if (id != null && id > 0) { + modelMap.put("taskDto", taskService.findOneDto(id)); + } else { + modelMap.put("taskDto", new TaskDto()); + } + } + @PostMapping("/tasks") public void filterTasks(@Valid TaskFilterDto taskFilterDto, ModelMap modelMap) { modelMap.put("filteredTasks", new TaskFilterDto(taskService.filter(taskFilterDto), diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css index 6d18c99..d61d7da 100644 --- a/src/main/resources/public/css/tasks.css +++ b/src/main/resources/public/css/tasks.css @@ -13,6 +13,17 @@ cursor: text; } +.filter .bootstrap-select{ + margin-bottom: 10px; +} + +.filter-option-inner-inner{ + font-size: 12px; + text-transform: uppercase; + font-weight: normal; + line-height: 25px; +} + .input-tag-name { border: none; box-shadow: none; diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html index daa689d..2fec161 100644 --- a/src/main/resources/templates/students/tasks.html +++ b/src/main/resources/templates/students/tasks.html @@ -27,7 +27,8 @@
Фильтр:
- -