From 8e74e8911c7d6598294db819b49f367d25185130 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Sun, 6 Apr 2025 00:15:29 +0400
Subject: [PATCH] #21 -- Add report status

---
 .../java/ru/ulstu/report/model/ReportStatus.java  | 15 ++++++++++++++-
 .../ru/ulstu/report/service/ReportService.java    |  2 +-
 .../resources/templates/report/reportList.html    |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/report/model/ReportStatus.java b/src/main/java/ru/ulstu/report/model/ReportStatus.java
index e1a2237..494059f 100644
--- a/src/main/java/ru/ulstu/report/model/ReportStatus.java
+++ b/src/main/java/ru/ulstu/report/model/ReportStatus.java
@@ -1,5 +1,18 @@
 package ru.ulstu.report.model;
 
 public enum ReportStatus {
-    NEW, REVIEW, CHECKING, APPROVED
+    NEW("новый"),
+    REVIEW("проверка руководителем"),
+    CHECKING("проверка в отделе аспирантуры"),
+    APPROVED("подтвержден");
+
+    private final String title;
+
+    ReportStatus(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
 }
diff --git a/src/main/java/ru/ulstu/report/service/ReportService.java b/src/main/java/ru/ulstu/report/service/ReportService.java
index 493b7c9..cbe46e6 100644
--- a/src/main/java/ru/ulstu/report/service/ReportService.java
+++ b/src/main/java/ru/ulstu/report/service/ReportService.java
@@ -48,7 +48,7 @@ public class ReportService {
         }
         report.setAspirant(aspirantService.getAspirantByUser(userService.getCurrentUser()));
         report.setCreateDate(reportDto.getCreateDate());
-        //TODO: add status
+        report.setStatus(reportDto.getStatus());
         return reportRepository.save(report);
     }
 
diff --git a/src/main/resources/templates/report/reportList.html b/src/main/resources/templates/report/reportList.html
index 73f8501..e17a76a 100644
--- a/src/main/resources/templates/report/reportList.html
+++ b/src/main/resources/templates/report/reportList.html
@@ -42,6 +42,7 @@
             <th scope="col">Аспирант</th>
             <th scope="col">Дата создания</th>
             <th scope="col">Статус</th>
+            <th scope="col"></th>
         </tr>
         </thead>
         <tbody>
@@ -49,7 +50,7 @@
             <td th:text="${#calendars.format(r.reportPeriod.startDate, 'dd.MM.yyyy') + ' - ' + #calendars.format(r.reportPeriod.endDate, 'dd.MM.yyyy')}"></td>
             <td th:text="${r.aspirant.surname + ' '+ r.aspirant.name + ' '+ r.aspirant.patronymic }"></td>
             <td th:text="${#calendars.format(r.createDate, 'dd.MM.yyyy HH:mm')}"></td>
-            <td th:text="${r.status}"></td>
+            <td th:text="${r.status.title}"></td>
             <td>
                 <!-- Ссылка на редактирование -->
                 <a th:href="@{'/report/edit-report/' + ${r.id}}" class="btn btn-sm btn-primary">