diff --git a/src/main/java/ru/ulstu/statistic/controller/StatisticController.java b/src/main/java/ru/ulstu/statistic/controller/StatisticController.java index 444c170..178f7d9 100644 --- a/src/main/java/ru/ulstu/statistic/controller/StatisticController.java +++ b/src/main/java/ru/ulstu/statistic/controller/StatisticController.java @@ -5,10 +5,15 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import ru.ulstu.aspirant.model.Aspirant; +import ru.ulstu.indicator.model.Course; import ru.ulstu.report.service.ReportPeriodService; +import ru.ulstu.statistic.model.RatingItem; import ru.ulstu.statistic.model.StatisticForm; import ru.ulstu.statistic.service.StatisticService; +import java.util.List; + @Controller @RequestMapping("statistic") public class StatisticController { @@ -25,12 +30,16 @@ public class StatisticController { public String getStatistic(Model model) { model.addAttribute("statisticForm", new StatisticForm()); model.addAttribute("reportPeriods", reportPeriodService.getReportPeriods()); + model.addAttribute("rating", List.of(new RatingItem(new Aspirant("Иванов", Course.FIRST), 20))); return "/statistic/statistic"; } @PostMapping("statistic") public String getStatistic(StatisticForm form, Model model) { - model.addAttribute("rating", statisticService.getRating(form.getReportPeriod().getId())); + //model.addAttribute("rating", statisticService.getRating(form.getReportPeriod().getId())); + model.addAttribute("statisticForm", form); + model.addAttribute("reportPeriods", reportPeriodService.getReportPeriods()); + model.addAttribute("rating", List.of(new RatingItem(new Aspirant("Иванов", Course.FIRST), 20))); return "/statistic/statistic"; } } \ No newline at end of file diff --git a/src/main/resources/templates/statistic/statistic.html b/src/main/resources/templates/statistic/statistic.html index b6dec84..d582e03 100644 --- a/src/main/resources/templates/statistic/statistic.html +++ b/src/main/resources/templates/statistic/statistic.html @@ -5,9 +5,13 @@