From 93829f21ef2f9a09def70b1df5e93682f71dbbf6 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Tue, 15 Apr 2025 22:03:28 +0400 Subject: [PATCH] #21 -- Fix buttons --- .../java/ru/ulstu/report/model/Report.java | 2 +- .../templates/report/editReport.html | 5 ++- .../templates/report/editReportValue.html | 8 +--- .../report/reportFilesListFragment.html | 43 ------------------- 4 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 src/main/resources/templates/report/reportFilesListFragment.html diff --git a/src/main/java/ru/ulstu/report/model/Report.java b/src/main/java/ru/ulstu/report/model/Report.java index e6eee72..bb8c329 100644 --- a/src/main/java/ru/ulstu/report/model/Report.java +++ b/src/main/java/ru/ulstu/report/model/Report.java @@ -31,7 +31,7 @@ public class Report extends BaseEntity { private Aspirant aspirant; @Enumerated(EnumType.STRING) - private ReportStatus status; + private ReportStatus status = ReportStatus.NEW; public Report() { } diff --git a/src/main/resources/templates/report/editReport.html b/src/main/resources/templates/report/editReport.html index 20080eb..9e7e2f9 100644 --- a/src/main/resources/templates/report/editReport.html +++ b/src/main/resources/templates/report/editReport.html @@ -12,8 +12,10 @@
- +

@@ -22,6 +24,7 @@ diff --git a/src/main/resources/templates/report/editReportValue.html b/src/main/resources/templates/report/editReportValue.html index 4d64947..437c76a 100644 --- a/src/main/resources/templates/report/editReportValue.html +++ b/src/main/resources/templates/report/editReportValue.html @@ -58,13 +58,7 @@ - - Отмена + Отмена diff --git a/src/main/resources/templates/report/reportFilesListFragment.html b/src/main/resources/templates/report/reportFilesListFragment.html deleted file mode 100644 index d5e2af5..0000000 --- a/src/main/resources/templates/report/reportFilesListFragment.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
- - -
- - - - -
- - - -
-
- - -
-
- -
- -
- -
-
-
- - - \ No newline at end of file