Defense modal: move Save to bottom-right next to issue-code action

services/progress-service/src/main/kotlin/ru/ysu/lms/progress/SubmissionStorage.kt

@@ -43,16 +43,18 @@ class SubmissionStorage(
         return StoredSubmission(dir, names)
     }
 
-    /** Собирает zip из сохранённых файлов сдачи. */
+    /** Собирает zip из сохранённых файлов сдачи, сохраняя реальное время изменения файлов. */
     fun zipOf(storedDir: Path): ByteArray {
         val out = ByteArrayOutputStream()
         ZipOutputStream(out).use { zos ->
-            Files.list(storedDir).forEach { file ->
+            Files.list(storedDir).use { stream ->
-                ZipEntry(file.fileName.toString()).also { entry ->
+                stream.forEach { file ->
-                    entry.time = 0
+                    ZipEntry(file.fileName.toString()).also { entry ->
-                    zos.putNextEntry(entry)
+                        entry.time = Files.getLastModifiedTime(file).toMillis()
-                    Files.copy(file, zos)
+                        zos.putNextEntry(entry)
-                    zos.closeEntry()
+                        Files.copy(file, zos)
+                        zos.closeEntry()
+                    }
                 }
             }
         }

web/src/main/kotlin/ru/ysu/lms/web/admin/AdminSupport.kt

@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
+import java.time.Instant
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
@@ -164,14 +165,14 @@ abstract class AdminSupport(
     ): ByteArray {
         val out = ByteArrayOutputStream()
         ZipOutputStream(out).use { zos ->
-            zos.putNextEntry(ZipEntry("ОПИСАНИЕ.txt").apply { time = 0 })
+            zos.putNextEntry(ZipEntry("ОПИСАНИЕ.txt"))
             zos.write("Архив сдач группы $groupName (последние попытки)\n".toByteArray(Charsets.UTF_8))
             zos.closeEntry()
             for (lab in labs) {
                 for (sub in api.labSubmissions(token, lab.id)) {
                     val student = studentById[sub.studentId] ?: continue
                     val bytes = api.downloadSubmissionAsAdmin(token, sub.id).bytes
-                    appendSubmissionArchive(zos, lab, student, bytes)
+                    appendSubmissionArchive(zos, lab, student, bytes, sub.createdAt)
                 }
             }
         }
@@ -183,13 +184,21 @@ abstract class AdminSupport(
         lab: LabSummaryDto,
         student: StudentRowDto,
         submissionZip: ByteArray,
+        submissionCreatedAt: String? = null,
     ) {
+        val fallbackMillis =
+            submissionCreatedAt
+                ?.let { runCatching { Instant.parse(it).toEpochMilli() }.getOrNull() }
+                ?: System.currentTimeMillis()
         ZipInputStream(ByteArrayInputStream(submissionZip)).use { zin ->
             var entry = zin.nextEntry
             while (entry != null) {
                 if (!entry.isDirectory) {
                     val safeName = student.fullName.replace(Regex("[\\\\/:*?\"<>|]"), "_")
-                    zos.putNextEntry(ZipEntry("ЛР${lab.number}/${student.studentNo}_$safeName/${entry.name}").apply { time = 0 })
+                    val entryMillis = entry.time.takeIf { it > 0 } ?: fallbackMillis
+                    zos.putNextEntry(
+                        ZipEntry("ЛР${lab.number}/${student.studentNo}_$safeName/${entry.name}").apply { time = entryMillis },
+                    )
                     zin.copyTo(zos)
                     zos.closeEntry()
                 }

web/src/main/resources/static/css/app.css

@@ -260,8 +260,8 @@ html.modal-open body { padding-right: var(--modal-scrollbar, 0); }
     margin-top: auto;
     align-self: flex-end;
 }
-.modal-body > #defense-actions { margin-top: auto; }
+.defense-footer { margin-top: auto; justify-content: flex-end; align-items: center; }
-.modal-body > #defense-actions .flex { justify-content: flex-end; }
+.modal-body > #defense-status:empty { display: none; }
 
 /* Двухуровневые формы уровней лабы */
 .level-row { display: flex; gap: 0.5rem; align-items: center; margin-bottom: 0.5rem; }

web/src/main/resources/templates/admin/group.html

@@ -209,16 +209,15 @@
                 </select></div>
             <div><label class="label" for="defense-md">Задание (markdown)</label>
                 <textarea class="input" id="defense-md" name="assignmentMd" rows="10" required></textarea></div>
-            <button class="btn btn-primary" type="submit">Сохранить задание</button>
         </form>
-        <div id="defense-actions" class="mt-4" hidden>
+        <p id="defense-status" class="text-sm text-muted mt-4"></p>
-            <p id="defense-status" class="text-sm text-muted mb-2"></p>
+        <div class="flex flex-wrap gap-2 defense-footer">
-            <div class="flex flex-wrap gap-2">
+            <div id="defense-actions" class="flex flex-wrap gap-2" hidden>
                 <form class="inline-form" id="defense-issue-form" method="post">
                     <input type="hidden" name="_csrf" th:value="${csrfToken}">
                     <input type="hidden" name="labId" id="defense-action-lab">
                     <input type="hidden" name="groupId" th:value="${group.id}">
-                    <button class="btn btn-primary" type="submit">Выдать код</button>
+                    <button class="btn btn-secondary" type="submit">Выдать код</button>
                 </form>
                 <form class="inline-form" id="defense-reset-form" method="post"
                       onsubmit="return confirm('Открыть защиту заново для нового (дополнительного) задания?')">
@@ -228,6 +227,7 @@
                     <button class="btn btn-danger" type="submit">Начать заново</button>
                 </form>
             </div>
+            <button class="btn btn-primary" type="submit" form="defense-form">Сохранить</button>
         </div>
     </div>
 </dialog>