From 691ccca54ba196d1a52dabdca62acd3d6584d9a5 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Tue, 15 Apr 2025 14:08:01 +0400
Subject: [PATCH] #21 -- Fix UI for files upload

---
 src/main/java/ru/ulstu/report/model/Report.java |  4 +++-
 .../templates/report/editReportValue.html       | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/ulstu/report/model/Report.java b/src/main/java/ru/ulstu/report/model/Report.java
index af6fed6..e6eee72 100644
--- a/src/main/java/ru/ulstu/report/model/Report.java
+++ b/src/main/java/ru/ulstu/report/model/Report.java
@@ -1,8 +1,10 @@
 package ru.ulstu.report.model;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Temporal;
@@ -19,7 +21,7 @@ public class Report extends BaseEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Date createDate = new Date();
 
-    @OneToMany
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private List<ReportValue> values = new ArrayList<>();
 
     @ManyToOne
diff --git a/src/main/resources/templates/report/editReportValue.html b/src/main/resources/templates/report/editReportValue.html
index b94e985..1036329 100644
--- a/src/main/resources/templates/report/editReportValue.html
+++ b/src/main/resources/templates/report/editReportValue.html
@@ -24,13 +24,13 @@
                            th:field="*{files[__${rowStat.index}__].name}"/>
                     <input type="hidden"
                            th:field="*{files[__${rowStat.index}__].tmpFileName}"/>
-                    <div class="col-2">
+                    <div class="col col-md-2">
                         <a class="btn btn-danger float-right"
                            th:onclick="|$('#files${rowStat.index}\\.deleted').val('true'); $('#files${rowStat.index}').hide(); |">
-                            <span aria-hidden="true"><i class="fa fa-times"/></span>
+                            <span><i class="fa fa-times"></i></span>
                         </a>
                     </div>
-                    <div class="col-10">
+                    <div class="col col-md-8">
                         <a th:if="${file.id != null}"
                            th:onclick="downloadFile(null, [[${file.id}]], [[${file.name}]])"
                            href="javascript:void(0)"
@@ -44,10 +44,14 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label for="loader">Загрузить файл:</label>
-                <div id="loader">
+            <div class="row">
+                <div class="col col-md-6">
+                    <div class="form-group">
+                        <label for="loader">Загрузить файл:</label>
+                        <div id="loader">
 
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -77,7 +81,6 @@
                     addNewFile(response, $("#files-list"));
                 }
             });
-            $('.selectpicker').selectpicker();
         });
 
         /*]]>*/