Mermutef/LMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phase 1 fixes: broken dialogs, score width, status badge, MSK date round-trip

Browse Source 
- group/lab/labs: move dialogs/scripts INSIDE the #content fragment (they were
  outside — the layout fragment dropped them, which is why 'add student' did nothing)
- group.html toast had swallowed the dialog (th:if createdStudent) — split properly
- .input-score width no longer overridden by .inline-form .input-sm (10rem min)
- lab page: remove separate 'change status' button — status badge is now a toggle
  button itself (confirm dialog kept)
- DateUtils.localInput/toUtcIso: dates entered in datetime-local are Moscow-local,
  stored as UTC instant, shown back MSK — correct round-trip both ways
- academic parseInstant: naive local datetimes treated as Europe/Moscow
- README/module docs left as-is
This commit is contained in:
Vladislav Kopnin
2026-09-11 23:11:40 +03:00
parent eec804a0ac
commit 7818f459bd
7 changed files with 215 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabService.kt
View File

@@ -17,7 +17,7 @@ import java.math.BigDecimal
import java.time.Instant import java.time.Instant
import java.time.LocalDateTime import java.time.LocalDateTime
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.time.ZoneOffset import java.time.ZoneId
import java.util.UUID import java.util.UUID
@Service @Service
@@ -291,7 +291,7 @@ class LabService(
val v = value?.takeIf { it.isNotBlank() } ?: return null val v = value?.takeIf { it.isNotBlank() } ?: return null
return runCatching { Instant.parse(v) } return runCatching { Instant.parse(v) }
.recoverCatching { OffsetDateTime.parse(v).toInstant() } .recoverCatching { OffsetDateTime.parse(v).toInstant() }
.recoverCatching { LocalDateTime.parse(v).atOffset(ZoneOffset.UTC).toInstant() } .recoverCatching { LocalDateTime.parse(v).atZone(ZoneId.of("Europe/Moscow")).toInstant() }
.getOrNull() .getOrNull()
} }
} }

28
web/src/main/kotlin/ru/ysu/lms/web/DateUtils.kt
View File

@@ -1,6 +1,7 @@
package ru.ysu.lms.web package ru.ysu.lms.web
import java.time.Instant import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId import java.time.ZoneId
import java.time.ZonedDateTime import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
@@ -8,14 +9,33 @@ import java.time.format.DateTimeFormatter
object DateUtils { object DateUtils {
private val MSK = ZoneId.of("Europe/Moscow") private val MSK = ZoneId.of("Europe/Moscow")
private val FORMAT = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm") private val FORMAT = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
private val INPUT_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm")
/** ISO instant string -> "02.11.2026 23:59" в Москве. */
fun formatMsk(value: String?): String? = fun formatMsk(value: String?): String? =
value?.let { toZoned(value)?.format(FORMAT)
/** ISO instant string -> "2026-11-02T02:59" для <input type="datetime-local"> (в московском времени). */
fun localInput(value: String?): String? =
toZoned(value)?.format(INPUT_FORMAT) ?: ""
/** Значение datetime-local (локальное московское) -> ISO instant строка, понятная API. */
fun toUtcIso(localValue: String?): String? =
localValue?.takeIf { it.isNotBlank() }?.let { s ->
try { try {
val zdt = ZonedDateTime.ofInstant(Instant.parse(it), MSK) LocalDateTime.parse(s, INPUT_FORMAT)
zdt.format(FORMAT) .atZone(MSK)
.toInstant()
.toString()
} catch (_: Exception) { } catch (_: Exception) {
it null
} }
} }
private fun toZoned(value: String?): ZonedDateTime? =
try {
value?.let { ZonedDateTime.ofInstant(Instant.parse(it), MSK) }
} catch (_: Exception) {
null
}
} }

14
web/src/main/kotlin/ru/ysu/lms/web/admin/AdminController.kt
View File

@@ -285,8 +285,8 @@ class AdminController(
model.addAttribute("descriptionHtml", markdown.render(lab.descriptionMd)) model.addAttribute("descriptionHtml", markdown.render(lab.descriptionMd))
model.addAttribute("deadlineMsk", ru.ysu.lms.web.DateUtils.formatMsk(lab.deadlineAt)) model.addAttribute("deadlineMsk", ru.ysu.lms.web.DateUtils.formatMsk(lab.deadlineAt))
model.addAttribute("defenseMsk", ru.ysu.lms.web.DateUtils.formatMsk(lab.defenseAt)) model.addAttribute("defenseMsk", ru.ysu.lms.web.DateUtils.formatMsk(lab.defenseAt))
model.addAttribute("deadlineLocal", lab.deadlineAt?.take(16) ?: "") model.addAttribute("deadlineLocal", ru.ysu.lms.web.DateUtils.localInput(lab.deadlineAt))
model.addAttribute("defenseLocal", lab.defenseAt?.take(16) ?: "") model.addAttribute("defenseLocal", ru.ysu.lms.web.DateUtils.localInput(lab.defenseAt))
return "admin/lab" return "admin/lab"
} }
@@ -336,8 +336,8 @@ class AdminController(
LabCreatePayload( LabCreatePayload(
number = number, number = number,
title = title.trim(), title = title.trim(),
deadlineAt = deadlineAt?.takeIf { it.isNotBlank() }, deadlineAt = ru.ysu.lms.web.DateUtils.toUtcIso(deadlineAt),
defenseAt = defenseAt?.takeIf { it.isNotBlank() }, defenseAt = ru.ysu.lms.web.DateUtils.toUtcIso(defenseAt),
pointsMax = java.math.BigDecimal(pointsMax), pointsMax = java.math.BigDecimal(pointsMax),
status = status, status = status,
descriptionMd = descriptionMd, descriptionMd = descriptionMd,
@@ -425,8 +425,8 @@ class AdminController(
val lab = api.labDetail(token(session), id) val lab = api.labDetail(token(session), id)
// datetime-local требует формат yyyy-MM-dd'T'HH:mm // datetime-local требует формат yyyy-MM-dd'T'HH:mm
model.addAttribute("lab", lab) model.addAttribute("lab", lab)
model.addAttribute("deadlineLocal", lab.deadlineAt?.take(16) ?: "") model.addAttribute("deadlineLocal", ru.ysu.lms.web.DateUtils.localInput(lab.deadlineAt))
model.addAttribute("defenseLocal", lab.defenseAt?.take(16) ?: "") model.addAttribute("defenseLocal", ru.ysu.lms.web.DateUtils.localInput(lab.defenseAt))
return "admin/lab-edit" return "admin/lab-edit"
} }
@@ -444,7 +444,7 @@ class AdminController(
): String = try { ): String = try {
api.updateLab( api.updateLab(
token(session), id, token(session), id,
LabUpdatePayload(title, deadlineAt?.takeIf { it.isNotBlank() }, defenseAt?.takeIf { it.isNotBlank() }, pointsMax, status, descriptionMd), LabUpdatePayload(title, ru.ysu.lms.web.DateUtils.toUtcIso(deadlineAt), ru.ysu.lms.web.DateUtils.toUtcIso(defenseAt), pointsMax, status, descriptionMd),
) )
redirect.addFlashAttribute("notice", "Лабораторная сохранена") redirect.addFlashAttribute("notice", "Лабораторная сохранена")
"redirect:/admin/labs/$id" "redirect:/admin/labs/$id"

2
web/src/main/resources/static/css/app.css
View File

@@ -165,6 +165,8 @@ tr:last-child td { border-bottom: none; }
.inline-form .input-sm { width: auto; min-width: 10rem; } .inline-form .input-sm { width: auto; min-width: 10rem; }
.input-sm { padding: 0.25rem 0.5rem; font-size: 0.8125rem; } .input-sm { padding: 0.25rem 0.5rem; font-size: 0.8125rem; }
.input-score { width: 4.5rem; } .input-score { width: 4.5rem; }
.inline-form .input-sm { width: auto; min-width: 0; }
.inline-form .input-score, input[type="number"].input-score { width: 4.5rem; min-width: 4.5rem; flex: 0 0 auto; }
.filter-select { width: auto; } .filter-select { width: auto; }
.hidden { display: none !important; } .hidden { display: none !important; }

57
web/src/main/resources/templates/admin/group.html
View File

@@ -106,7 +106,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div th:if="${createdStudent}" class="card import-card toast"> <div th:if="${createdStudent}" class="card import-card toast">
<div class="card-body"> <div class="card-body">
@@ -115,34 +114,36 @@
<p class="text-sm">Логин: <code class="code font-mono" th:text="${createdStudent.studentNo}">—</code></p> <p class="text-sm">Логин: <code class="code font-mono" th:text="${createdStudent.studentNo}">—</code></p>
<p class="text-sm">Пароль: <code class="code font-mono font-semibold" th:text="${createdStudent.password}">—</code></p> <p class="text-sm">Пароль: <code class="code font-mono font-semibold" th:text="${createdStudent.password}">—</code></p>
</div> </div>
</div>
<dialog id="modal-add-student" class="modal">
<div class="modal-header">
<h2 class="modal-title">Добавить студента</h2>
<button class="modal-close" type="button" onclick="closeModal('modal-add-student')">✕</button>
</div> </div>
<div class="modal-body"> <dialog id="modal-add-student" class="modal">
<form class="form-stack" th:action="@{/admin/groups/{gid}/students/create(gid=${group.id})}" method="post"> <div class="modal-header">
<input type="hidden" name="_csrf" th:value="${csrfToken}"> <h2 class="modal-title">Добавить студента</h2>
<div class="grid grid-2"> <button class="modal-close" type="button" onclick="closeModal('modal-add-student')">✕</button>
<div><label class="label" for="stNo">Студенческий номер (логин)</label> </div>
<input class="input" id="stNo" name="studentNo" required></div> <div class="modal-body">
<div><label class="label" for="stBasis">Основа обучения</label> <form class="form-stack" th:action="@{/admin/groups/{gid}/students/create(gid=${group.id})}" method="post">
<input class="input" id="stBasis" name="basis" placeholder="бюджет"></div> <input type="hidden" name="_csrf" th:value="${csrfToken}">
</div> <div class="grid grid-2">
<div><label class="label" for="stLast">Фамилия</label> <div><label class="label" for="stNo">Студенческий номер (логин)</label>
<input class="input" id="stLast" name="lastName" required></div> <input class="input" id="stNo" name="studentNo" required></div>
<div class="grid grid-2"> <div><label class="label" for="stBasis">Основа обучения</label>
<div><label class="label" for="stFirst">Имя</label> <input class="input" id="stBasis" name="basis" placeholder="бюджет"></div>
<input class="input" id="stFirst" name="firstName"></div> </div>
<div><label class="label" for="stMiddle">Отчество</label> <div><label class="label" for="stLast">Фамилия</label>
<input class="input" id="stMiddle" name="middleName"></div> <input class="input" id="stLast" name="lastName" required></div>
</div> <div class="grid grid-2">
<p class="hint">Пароль будет сгенерирован автоматически.</p> <div><label class="label" for="stFirst">Имя</label>
<button class="btn btn-primary" type="submit">Добавить</button> <input class="input" id="stFirst" name="firstName"></div>
</form> <div><label class="label" for="stMiddle">Отчество</label>
</div> <input class="input" id="stMiddle" name="middleName"></div>
</dialog> </div>
<p class="hint">Пароль будет сгенерирован автоматически.</p>
<button class="btn btn-primary" type="submit">Добавить</button>
</form>
</div>
</dialog>
</div>
</body> </body>
</html> </html>

223
web/src/main/resources/templates/admin/lab.html
View File

@@ -8,10 +8,10 @@
<div> <div>
<h1 class="page-title" th:text="|ЛР ${lab.number}. ${lab.title}|">ЛР 1</h1> <h1 class="page-title" th:text="|ЛР ${lab.number}. ${lab.title}|">ЛР 1</h1>
<p class="text-sm text-muted"> <p class="text-sm text-muted">
Статус: <span class="badge" th:classappend="${lab.status == 'published'} ? 'badge-ok' : 'badge-warn'" th:text="${lab.status}">—</span> Статус: <form class="inline-form" th:action="@{/admin/labs/{id}/toggle-status(id=${lab.id})}" method="post">
<form class="inline-form" th:action="@{/admin/labs/{id}/toggle-status(id=${lab.id})}" method="post">
<input type="hidden" name="_csrf" th:value="${csrfToken}"> <input type="hidden" name="_csrf" th:value="${csrfToken}">
<button class="btn btn-secondary btn-sm ml-2" onclick="return confirm('Сменить статус лабораторной?')" type="submit">Сменить статус</button> <button class="badge badge-btn" type="submit" onclick="return confirm('Сменить статус лабораторной?')"
th:classappend="${lab.status == 'published'} ? 'badge-ok' : 'badge-warn'" th:text="${lab.status}">—</button>
</form> </form>
<span th:if="${deadlineMsk != null}"> · Срок: <span th:text="${deadlineMsk} + ' МСК'"></span></span> <span th:if="${deadlineMsk != null}"> · Срок: <span th:text="${deadlineMsk} + ' МСК'"></span></span>
<span th:if="${defenseMsk != null}"> · Защита: <span th:text="${defenseMsk} + ' МСК'"></span></span> <span th:if="${defenseMsk != null}"> · Защита: <span th:text="${defenseMsk} + ' МСК'"></span></span>
@@ -136,126 +136,127 @@
</table> </table>
</div> </div>
</div> </div>
</div>
<dialog id="modal-meta" class="modal">
<div class="modal-header">
<h2 class="modal-title">Правка лабораторной</h2>
<button class="modal-close" type="button" onclick="closeModal('modal-meta')">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{id}/edit(id=${lab.id})}" method="post">
<div><label class="label" for="metaTitle">Название</label>
<input class="input" id="metaTitle" name="title" th:value="${lab.title}" required></div>
<div class="grid grid-2">
<div><label class="label" for="metaDeadline">Срок сдачи</label>
<input class="input" id="metaDeadline" name="deadlineAt" type="datetime-local" th:value="${deadlineLocal}"></div>
<div><label class="label" for="metaDefense">Дата защиты</label>
<input class="input" id="metaDefense" name="defenseAt" type="datetime-local" th:value="${defenseLocal}"></div>
</div>
<div class="grid grid-2">
<div><label class="label" for="metaPoints">Максимум баллов</label>
<input class="input" id="metaPoints" name="pointsMax" type="number" step="0.1" min="0" th:value="${lab.pointsMax}" required></div>
<div><label class="label" for="metaStatus">Статус</label>
<select class="input" id="metaStatus" name="status">
<option value="draft" th:selected="${lab.status == 'draft'}">draft</option>
<option value="published" th:selected="${lab.status == 'published'}">published</option>
<option value="archived" th:selected="${lab.status == 'archived'}">archived</option>
</select></div>
</div>
<div><label class="label" for="metaDesc">Условие (markdown)</label>
<textarea class="input" id="metaDesc" name="descriptionMd" rows="12" th:text="${lab.descriptionMd}"></textarea></div>
<button class="btn btn-primary" type="submit">Сохранить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<dialog id="modal-add-level" class="modal"> <dialog id="modal-meta" class="modal">
<div class="modal-header">
<h2 class="modal-title">Добавить уровень</h2>
<button class="modal-close" type="button" onclick="closeModal('modal-add-level')">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/levels/save(labId=${lab.id})}" method="post">
<div class="grid grid-2">
<div><label class="label" for="lvlCode">Код</label>
<input class="input" id="lvlCode" name="code" placeholder="pro" required></div>
<div><label class="label" for="lvlTitle">Название</label>
<input class="input" id="lvlTitle" name="title" placeholder="Профессиональный" required></div>
</div>
<button class="btn btn-primary" type="submit">Добавить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<dialog th:each="level : ${lab.levels}" th:id="|modal-rename-level-${level.id}|" class="modal">
<div class="modal-header">
<h2 class="modal-title">Переименовать уровень</h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-rename-level-' + level.id}" onclick="closeModalData(this)">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/levels/save(labId=${lab.id})}" method="post">
<input type="hidden" name="levelId" th:value="${level.id}">
<input type="hidden" name="code" th:value="${level.code}">
<div><label class="label">Название</label>
<input class="input" name="title" th:value="${level.title}" required></div>
<button class="btn btn-primary" type="submit">Сохранить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<dialog th:each="level : ${lab.levels}" th:id="|modal-add-variant-${level.id}|" class="modal">
<div class="modal-header">
<h2 class="modal-title">Новый вариант — <span th:text="${level.title}">уровень</span></h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-add-variant-' + level.id}" onclick="closeModalData(this)">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/variants/save(labId=${lab.id})}" method="post">
<input type="hidden" name="labLevelId" th:value="${level.id}">
<div class="grid grid-2">
<div><label class="label">Номер</label><input class="input" name="number" required></div>
<div><label class="label">Название</label><input class="input" name="title"></div>
</div>
<div><label class="label">Условие (markdown)</label>
<textarea class="input" name="statementMd" rows="8"></textarea></div>
<button class="btn btn-primary" type="submit">Добавить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<th:block th:each="level : ${lab.levels}">
<dialog th:each="v : ${level.variants}" th:id="|modal-edit-variant-${v.id}|" class="modal">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title">Правка варианта</h2> <h2 class="modal-title">Правка лабораторной</h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-edit-variant-' + v.id}" onclick="closeModalData(this)">✕</button> <button class="modal-close" type="button" onclick="closeModal('modal-meta')">✕</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/variants/save(labId=${lab.id})}" method="post"> <form class="form-stack" th:action="@{/admin/labs/{id}/edit(id=${lab.id})}" method="post">
<input type="hidden" name="variantId" th:value="${v.id}"> <div><label class="label" for="metaTitle">Название</label>
<input type="hidden" name="labLevelId" th:value="${level.id}"> <input class="input" id="metaTitle" name="title" th:value="${lab.title}" required></div>
<div class="grid grid-2"> <div class="grid grid-2">
<div><label class="label">Номер</label><input class="input" name="number" th:value="${v.number}" required></div> <div><label class="label" for="metaDeadline">Срок сдачи</label>
<div><label class="label">Название</label><input class="input" name="title" th:value="${v.title}"></div> <input class="input" id="metaDeadline" name="deadlineAt" type="datetime-local" th:value="${deadlineLocal}"></div>
<div><label class="label" for="metaDefense">Дата защиты</label>
<input class="input" id="metaDefense" name="defenseAt" type="datetime-local" th:value="${defenseLocal}"></div>
</div> </div>
<div><label class="label">Условие (markdown)</label> <div class="grid grid-2">
<textarea class="input" name="statementMd" rows="8" th:text="${v.statementMd}"></textarea></div> <div><label class="label" for="metaPoints">Максимум баллов</label>
<input class="input" id="metaPoints" name="pointsMax" type="number" step="0.1" min="0" th:value="${lab.pointsMax}" required></div>
<div><label class="label" for="metaStatus">Статус</label>
<select class="input" id="metaStatus" name="status">
<option value="draft" th:selected="${lab.status == 'draft'}">draft</option>
<option value="published" th:selected="${lab.status == 'published'}">published</option>
<option value="archived" th:selected="${lab.status == 'archived'}">archived</option>
</select></div>
</div>
<div><label class="label" for="metaDesc">Условие (markdown)</label>
<textarea class="input" id="metaDesc" name="descriptionMd" rows="12" th:text="${lab.descriptionMd}"></textarea></div>
<button class="btn btn-primary" type="submit">Сохранить</button> <button class="btn btn-primary" type="submit">Сохранить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}"> <input type="hidden" name="_csrf" th:value="${csrfToken}">
</form> </form>
</div> </div>
</dialog> </dialog>
</th:block>
<script> <dialog id="modal-add-level" class="modal">
function filterGroups(name) { <div class="modal-header">
document.querySelectorAll('.group-section').forEach(function (el) { <h2 class="modal-title">Добавить уровень</h2>
el.classList.toggle('hidden', !!name && el.getAttribute('data-group') !== name); <button class="modal-close" type="button" onclick="closeModal('modal-add-level')">✕</button>
}); </div>
} <div class="modal-body">
</script> <form class="form-stack" th:action="@{/admin/labs/{labId}/levels/save(labId=${lab.id})}" method="post">
<div class="grid grid-2">
<div><label class="label" for="lvlCode">Код</label>
<input class="input" id="lvlCode" name="code" placeholder="pro" required></div>
<div><label class="label" for="lvlTitle">Название</label>
<input class="input" id="lvlTitle" name="title" placeholder="Профессиональный" required></div>
</div>
<button class="btn btn-primary" type="submit">Добавить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<dialog th:each="level : ${lab.levels}" th:id="|modal-rename-level-${level.id}|" class="modal">
<div class="modal-header">
<h2 class="modal-title">Переименовать уровень</h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-rename-level-' + level.id}" onclick="closeModalData(this)">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/levels/save(labId=${lab.id})}" method="post">
<input type="hidden" name="levelId" th:value="${level.id}">
<input type="hidden" name="code" th:value="${level.code}">
<div><label class="label">Название</label>
<input class="input" name="title" th:value="${level.title}" required></div>
<button class="btn btn-primary" type="submit">Сохранить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<dialog th:each="level : ${lab.levels}" th:id="|modal-add-variant-${level.id}|" class="modal">
<div class="modal-header">
<h2 class="modal-title">Новый вариант — <span th:text="${level.title}">уровень</span></h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-add-variant-' + level.id}" onclick="closeModalData(this)">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/variants/save(labId=${lab.id})}" method="post">
<input type="hidden" name="labLevelId" th:value="${level.id}">
<div class="grid grid-2">
<div><label class="label">Номер</label><input class="input" name="number" required></div>
<div><label class="label">Название</label><input class="input" name="title"></div>
</div>
<div><label class="label">Условие (markdown)</label>
<textarea class="input" name="statementMd" rows="8"></textarea></div>
<button class="btn btn-primary" type="submit">Добавить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
<th:block th:each="level : ${lab.levels}">
<dialog th:each="v : ${level.variants}" th:id="|modal-edit-variant-${v.id}|" class="modal">
<div class="modal-header">
<h2 class="modal-title">Правка варианта</h2>
<button class="modal-close" type="button" th:attr="data-modal=${'modal-edit-variant-' + v.id}" onclick="closeModalData(this)">✕</button>
</div>
<div class="modal-body">
<form class="form-stack" th:action="@{/admin/labs/{labId}/variants/save(labId=${lab.id})}" method="post">
<input type="hidden" name="variantId" th:value="${v.id}">
<input type="hidden" name="labLevelId" th:value="${level.id}">
<div class="grid grid-2">
<div><label class="label">Номер</label><input class="input" name="number" th:value="${v.number}" required></div>
<div><label class="label">Название</label><input class="input" name="title" th:value="${v.title}"></div>
</div>
<div><label class="label">Условие (markdown)</label>
<textarea class="input" name="statementMd" rows="8" th:text="${v.statementMd}"></textarea></div>
<button class="btn btn-primary" type="submit">Сохранить</button>
<input type="hidden" name="_csrf" th:value="${csrfToken}">
</form>
</div>
</dialog>
</th:block>
<script>
function filterGroups(name) {
document.querySelectorAll('.group-section').forEach(function (el) {
el.classList.toggle('hidden', !!name && el.getAttribute('data-group') !== name);
});
}
</script>
</div>
</body> </body>
</html> </html>

75
web/src/main/resources/templates/admin/labs.html
View File

@@ -34,43 +34,44 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<dialog id="modal-create-lab" class="modal">
<div class="modal-header"> <dialog id="modal-create-lab" class="modal">
<h2 class="modal-title">Новая лабораторная</h2> <div class="modal-header">
<button class="modal-close" type="button" onclick="closeModal('modal-create-lab')">✕</button> <h2 class="modal-title">Новая лабораторная</h2>
</div> <button class="modal-close" type="button" onclick="closeModal('modal-create-lab')">✕</button>
<div class="modal-body"> </div>
<form class="form-stack" th:action="@{/admin/labs/create}" method="post"> <div class="modal-body">
<div class="grid grid-2"> <form class="form-stack" th:action="@{/admin/labs/create}" method="post">
<div><label class="label" for="labNumber">Номер</label> <div class="grid grid-2">
<input class="input" id="labNumber" name="number" type="number" min="1" required></div> <div><label class="label" for="labNumber">Номер</label>
<div><label class="label" for="labPoints">Максимум баллов</label> <input class="input" id="labNumber" name="number" type="number" min="1" required></div>
<input class="input" id="labPoints" name="pointsMax" type="number" step="0.1" min="0" value="5" required></div> <div><label class="label" for="labPoints">Максимум баллов</label>
</div> <input class="input" id="labPoints" name="pointsMax" type="number" step="0.1" min="0" value="5" required></div>
<div><label class="label" for="labTitle">Название</label> </div>
<input class="input" id="labTitle" name="title" required></div> <div><label class="label" for="labTitle">Название</label>
<div class="grid grid-2"> <input class="input" id="labTitle" name="title" required></div>
<div><label class="label" for="labDeadline">Срок сдачи</label> <div class="grid grid-2">
<input class="input" id="labDeadline" name="deadlineAt" type="datetime-local"></div> <div><label class="label" for="labDeadline">Срок сдачи</label>
<div><label class="label" for="labDefense">Дата защиты</label> <input class="input" id="labDeadline" name="deadlineAt" type="datetime-local"></div>
<input class="input" id="labDefense" name="defenseAt" type="datetime-local"></div> <div><label class="label" for="labDefense">Дата защиты</label>
</div> <input class="input" id="labDefense" name="defenseAt" type="datetime-local"></div>
<div><label class="label" for="labStatus">Статус</label> </div>
<select class="input" id="labStatus" name="status"> <div><label class="label" for="labStatus">Статус</label>
<option value="draft">draft</option> <select class="input" id="labStatus" name="status">
<option value="published">published</option> <option value="draft">draft</option>
</select></div> <option value="published">published</option>
<div><label class="label" for="labLevels">Уровни (по одному на строку: код; название)</label> </select></div>
<textarea class="input" id="labLevels" name="levels" rows="4" placeholder="basic; Основная группа&#10;advanced; Повышенная сложность"></textarea> <div><label class="label" for="labLevels">Уровни (по одному на строку: код; название)</label>
<p class="hint">Если оставить пустым, будет создан уровень «Основная группа». Варианты добавите на странице лабы.</p></div> <textarea class="input" id="labLevels" name="levels" rows="4" placeholder="basic; Основная группа&#10;advanced; Повышенная сложность"></textarea>
<div><label class="label" for="labDesc">Условие (markdown, можно позже)</label> <p class="hint">Если оставить пустым, будет создан уровень «Основная группа». Варианты добавите на странице лабы.</p></div>
<textarea class="input" id="labDesc" name="descriptionMd" rows="6"></textarea></div> <div><label class="label" for="labDesc">Условие (markdown, можно позже)</label>
<button class="btn btn-primary" type="submit">Создать</button> <textarea class="input" id="labDesc" name="descriptionMd" rows="6"></textarea></div>
<input type="hidden" name="_csrf" th:value="${csrfToken}"> <button class="btn btn-primary" type="submit">Создать</button>
</form> <input type="hidden" name="_csrf" th:value="${csrfToken}">
</div> </form>
</dialog> </div>
</dialog>
</div>
</body> </body>
</html> </html>