From 732ffc3441019d9d0f4e67b63d0fefb52a9a186a Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Thu, 3 Apr 2025 11:30:19 +0400
Subject: [PATCH] #21 -- Fix displaying statistic

---
 .../statistic/controller/StatisticController.java | 11 ++++++++++-
 .../resources/templates/statistic/statistic.html  | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

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 @@
 
     <form action="/statistic/statistic" method="post" th:object="${statisticForm}">
         <div class="row">
-            <div class="col col-md-6">
+            <div class="col col-md-2">
                 <div class="form-group">
                     <label for="period">Период отчетности</label>
+                </div>
+            </div>
+            <div class="col col-md-4">
+                <div class="form-group">
                     <select class="form-select form-control"
                             id="period" aria-label="multiple select example"
                             th:field="*{reportPeriod}">
@@ -18,6 +22,11 @@
                     </select>
                 </div>
             </div>
+            <div class="col col-md-4">
+                <div class="form-group">
+                    <button type="submit" class="btn btn-outline-dark">Применить</button>
+                </div>
+            </div>
         </div>
     </form>
 
@@ -30,6 +39,10 @@
         </tr>
         </thead>
         <tbody>
+        <tr th:each="r : ${rating}">
+            <td th:text="${r.aspirant.surname + ' '+ r.aspirant.name + ' '+ r.aspirant.patronymic }"></td>
+            <td th:text="${r.score}"></td>
+        </tr>
         </tbody>
     </table>
 </div>