Compare commits
15 Commits
fb9511280a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 920d96a0f5 | |||
| 2beffd84f1 | |||
| d8e28e88fc | |||
| 44edb5ebeb | |||
| e2e3ed1eaf | |||
| 7fb3e13548 | |||
| 9ddf2c6ce9 | |||
| a336612ad5 | |||
| c8581c620a | |||
| 54e5721267 | |||
| 26573f2210 | |||
| bfdae41fb8 | |||
| 9e16566160 | |||
| dc13ba3186 | |||
| f5ba21b5f5 |
@@ -13,10 +13,10 @@ object AttestationPresentation {
|
||||
mapOf(
|
||||
"intermediate" to
|
||||
mapOf(
|
||||
"excellent" to "отл",
|
||||
"satisfactory" to "атт",
|
||||
"unsatisfactory" to "неуд",
|
||||
"not_attested" to "не атт",
|
||||
"excellent" to "отлично",
|
||||
"satisfactory" to "аттестован",
|
||||
"unsatisfactory" to "неудовлетворительно",
|
||||
"not_attested" to "не аттестован",
|
||||
),
|
||||
"pass" to
|
||||
mapOf(
|
||||
@@ -43,6 +43,22 @@ object AttestationPresentation {
|
||||
|
||||
fun kindLabel(kind: String): String = KIND_LABELS[kind] ?: kind
|
||||
|
||||
/** Короткая подпись для шапки узкого столбца. */
|
||||
fun shortKindLabel(kind: String): String =
|
||||
when (kind) {
|
||||
"intermediate" -> "Пр. атт."
|
||||
"pass" -> "Зачёт"
|
||||
"exam" -> "Экзамен"
|
||||
else -> kind
|
||||
}
|
||||
|
||||
/** Понимает и «2», и старые значения вроде «2 семестр»; вне 1–8 — 1. */
|
||||
fun semesterNumber(raw: String): Int {
|
||||
val digits = raw.filter { it.isDigit() }
|
||||
val value = digits.toIntOrNull() ?: return 1
|
||||
return if (value in 1..8) value else 1
|
||||
}
|
||||
|
||||
fun valueLabel(
|
||||
kind: String,
|
||||
value: String,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package ru.ysu.lms.web.admin
|
||||
|
||||
import jakarta.servlet.http.HttpSession
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.http.HttpHeaders
|
||||
import org.springframework.http.MediaType
|
||||
import org.springframework.http.ResponseEntity
|
||||
@@ -59,6 +60,8 @@ class AdminGroupController(
|
||||
markdown: MarkdownRenderer,
|
||||
mapper: ObjectMapper,
|
||||
) : AdminSupport(api, markdown, mapper) {
|
||||
private val log = LoggerFactory.getLogger(AdminGroupController::class.java)
|
||||
|
||||
@GetMapping
|
||||
fun dashboard(
|
||||
session: HttpSession,
|
||||
@@ -143,7 +146,7 @@ class AdminGroupController(
|
||||
val allLabs = api.listLabs(t)
|
||||
val group = api.groupDetail(t, id)
|
||||
val labs = allLabs.filter { it.status == "published" }
|
||||
val attestations = GroupAttestationViews.columns(api.listAttestations(t, id))
|
||||
val attestations = loadAttestations(t, id)
|
||||
val grades = api.listGrades(t)
|
||||
val gradeBy = grades.associate { "${it.studentId}|${it.labId}" to it.score }
|
||||
val generalCommentBy = grades.associate { "${it.studentId}|${it.labId}" to it.generalComment }
|
||||
@@ -260,6 +263,17 @@ class AdminGroupController(
|
||||
)
|
||||
}
|
||||
|
||||
/** Аттестации не должны ронять всю ведомость, если сервис ещё не обновлён. */
|
||||
private fun loadAttestations(
|
||||
token: String,
|
||||
groupId: String,
|
||||
): List<GroupAttestation> =
|
||||
GroupAttestationViews.columns(
|
||||
runCatching { api.listAttestations(token, groupId) }
|
||||
.onFailure { log.warn("Не удалось загрузить аттестации группы {}", groupId, it) }
|
||||
.getOrDefault(emptyList()),
|
||||
)
|
||||
|
||||
private fun averageScore(cells: List<GroupLabCell>): String? {
|
||||
val scores = cells.mapNotNull { it.score?.replace(',', '.')?.toBigDecimalOrNull() }
|
||||
if (scores.isEmpty()) return null
|
||||
|
||||
@@ -69,6 +69,7 @@ data class GroupAttestation(
|
||||
val id: String = "",
|
||||
val kind: String = "",
|
||||
val kindLabel: String = "",
|
||||
val shortLabel: String = "",
|
||||
val semester: Int = 1,
|
||||
val published: Boolean = false,
|
||||
val options: List<AttestationOption> = emptyList(),
|
||||
|
||||
@@ -18,7 +18,8 @@ object GroupAttestationViews {
|
||||
id = column.id,
|
||||
kind = column.kind,
|
||||
kindLabel = AttestationPresentation.kindLabel(column.kind),
|
||||
semester = column.semester,
|
||||
shortLabel = AttestationPresentation.shortKindLabel(column.kind),
|
||||
semester = AttestationPresentation.semesterNumber(column.semester),
|
||||
published = column.published,
|
||||
options =
|
||||
VALUES_BY_KIND[column.kind].orEmpty().map { value ->
|
||||
|
||||
@@ -275,7 +275,8 @@ data class AttestationDto(
|
||||
val id: String = "",
|
||||
val groupId: String = "",
|
||||
val kind: String = "",
|
||||
val semester: Int = 1,
|
||||
/** Строка — чтобы старые ответы с текстовым семестром не ломали разбор. */
|
||||
val semester: String = "1",
|
||||
val published: Boolean = false,
|
||||
val results: List<AttestationResultDto> = emptyList(),
|
||||
)
|
||||
|
||||
@@ -94,7 +94,7 @@ class StudentController(
|
||||
val result = column.results.firstOrNull()
|
||||
StudentAttestationView(
|
||||
kindLabel = AttestationPresentation.kindLabel(column.kind),
|
||||
semester = column.semester,
|
||||
semester = AttestationPresentation.semesterNumber(column.semester),
|
||||
valueLabel = result?.let { AttestationPresentation.valueLabel(column.kind, it.value) } ?: "—",
|
||||
positive = result?.let { AttestationPresentation.isPositive(column.kind, it.value) },
|
||||
)
|
||||
|
||||
@@ -467,7 +467,7 @@ code.code { padding: 0.125rem 0.5rem; border-radius: var(--radius-xs); font-fami
|
||||
.variant-btn.manual .cell-none { font-weight: 600; }
|
||||
.score-link {
|
||||
display: inline-block; padding: 0; border: none; background: none;
|
||||
font-size: 0.8125rem; font-weight: 600; font-variant-numeric: tabular-nums;
|
||||
font-size: 0.84375rem; font-weight: 600; font-variant-numeric: tabular-nums;
|
||||
color: var(--c-text); cursor: pointer;
|
||||
}
|
||||
.score-link:hover { color: var(--c-accent); text-decoration: underline; }
|
||||
@@ -495,7 +495,12 @@ code.code { padding: 0.125rem 0.5rem; border-radius: var(--radius-xs); font-fami
|
||||
.cell-btn.st.dim::before { background: var(--c-border-strong); }
|
||||
.mini-count { font-size: 0.72rem; margin-left: 0.15rem; color: var(--c-text-muted); }
|
||||
.defense-cell-timer { font-variant-numeric: tabular-nums; }
|
||||
.lab-head-actions { display: flex; gap: 0.2rem; }
|
||||
.lab-head-actions { display: flex; gap: 0.2rem; align-items: center; }
|
||||
.lab-head-actions .btn {
|
||||
height: 2.25rem; min-height: 2.25rem; padding: 0 0.5rem;
|
||||
display: inline-flex; align-items: center; justify-content: center; box-sizing: border-box;
|
||||
}
|
||||
.lab-head-actions .ico { font-size: 0.95rem; line-height: 1; }
|
||||
.btn btn-secondary btn-sm p-2 {
|
||||
display: inline-flex; align-items: center; justify-content: center;
|
||||
min-width: 1.5rem; height: 1.5rem; padding: 0 0.3rem; cursor: pointer;
|
||||
@@ -546,25 +551,72 @@ dialog.dlg.dlg-lg .dlg-body { max-height: 88vh; min-height: 62vh; }
|
||||
.scroll-x { overflow-x: auto; }
|
||||
.matrix { border-collapse: separate; border-spacing: 0; }
|
||||
.matrix th {
|
||||
vertical-align: top; padding: 0.75rem 1rem; text-align: left;
|
||||
vertical-align: middle; padding: 0.75rem 1rem; text-align: left;
|
||||
font-size: 0.75rem; font-weight: 500; color: var(--c-text-muted);
|
||||
background: var(--c-surface); white-space: nowrap;
|
||||
}
|
||||
.matrix td { vertical-align: top; padding: 1rem; }
|
||||
.matrix td { vertical-align: middle; padding: 1rem; font-size: 0.84375rem; }
|
||||
#group-table td .student-name,
|
||||
#group-table td .score-link,
|
||||
#group-table td .attestation-select,
|
||||
#group-table td .cell-sub,
|
||||
#group-table td .sub-link,
|
||||
#group-table td .cell-btn.st,
|
||||
#group-table td .font-mono,
|
||||
#group-table td .mini-count,
|
||||
#group-table td .badge,
|
||||
#group-table td .btn { font-size: 0.84375rem; }
|
||||
/* Непрозрачный фон обязателен: закреплённый столбец не должен просвечивать при прокрутке. */
|
||||
.matrix tbody tr:hover td { background: var(--c-row-hover); }
|
||||
.matrix tbody tr:hover td.matrix-sticky { background: var(--c-row-hover); }
|
||||
.matrix tbody tr:last-child td { border-bottom: none; }
|
||||
.matrix th.lab-col { min-width: 9.5rem; border-left: 1px solid var(--c-border); }
|
||||
.matrix td.cell-lab { min-width: 9.5rem; border-left: 1px solid var(--c-border); }
|
||||
.matrix th.attestation-col { min-width: 10rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); }
|
||||
.matrix td.attestation-cell { min-width: 10rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); }
|
||||
.matrix th.average-col { min-width: 7rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); }
|
||||
.matrix td.average-cell { min-width: 7rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); font-weight: 600; }
|
||||
.attestation-head { display: flex; flex-direction: column; align-items: flex-start; gap: 0.25rem; text-align: left; }
|
||||
.attestation-kind { font-weight: 600; color: var(--c-text); }
|
||||
.attestation-select { width: 100%; min-width: 8.5rem; font-size: 0.8125rem; }
|
||||
#group-table th.average-col,
|
||||
#group-table th.actions-head { color: var(--c-text); font-weight: 400; }
|
||||
#group-table th.actions-head,
|
||||
#group-table td.actions-cell { border-left: 1px solid var(--c-border); }
|
||||
.matrix th.attestation-col {
|
||||
width: 12rem; min-width: 11.5rem; max-width: 12rem;
|
||||
border-left: 1px solid var(--c-border);
|
||||
}
|
||||
.matrix td.attestation-cell {
|
||||
width: 12rem; min-width: 11.5rem; max-width: 12rem;
|
||||
padding-left: 0.35rem; padding-right: 0.35rem;
|
||||
border-left: 1px solid var(--c-border);
|
||||
}
|
||||
.matrix th.average-col,
|
||||
.matrix td.average-cell {
|
||||
min-width: 7rem; border-left: 1px solid var(--c-border); text-align: left;
|
||||
}
|
||||
.matrix td.average-cell { font-weight: 600; text-align: center; }
|
||||
.attestation-title { display: flex; flex-wrap: wrap; align-items: center; gap: 0.35rem; width: 100%; max-width: 9rem; text-align: left; }
|
||||
.attestation-kind { font-weight: 400; color: var(--c-text); white-space: normal; text-align: left; }
|
||||
.attestation-col .lab-col-head, .attestation-col .lab-col-title { text-align: left; }
|
||||
.js-attestation-form { display: flex; justify-content: center; width: 100%; }
|
||||
.attestation-select {
|
||||
appearance: none; -webkit-appearance: none;
|
||||
width: 100%; max-width: 100%; min-width: 0; padding: 0.15rem 0.95rem 0.15rem 0.15rem;
|
||||
border: 1px solid transparent; border-radius: var(--radius-sm);
|
||||
background-color: transparent; color: var(--c-text);
|
||||
font-size: 0.84375rem; font-weight: 600; font-variant-numeric: tabular-nums;
|
||||
text-align: center; text-align-last: center; cursor: pointer;
|
||||
background-image:
|
||||
linear-gradient(45deg, transparent 50%, currentColor 50%),
|
||||
linear-gradient(135deg, currentColor 50%, transparent 50%);
|
||||
background-position: calc(100% - 8px) 55%, calc(100% - 3px) 55%;
|
||||
background-size: 5px 5px, 5px 5px;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.attestation-select:hover { color: var(--c-accent); text-decoration: underline; }
|
||||
.attestation-select:focus { outline: none; border-color: var(--c-accent); box-shadow: 0 0 0 3px var(--c-accent-soft); }
|
||||
.attestation-select.none { color: var(--c-text-muted); font-weight: 400; }
|
||||
.attestation-select:disabled { opacity: 0.6; cursor: wait; }
|
||||
.attestation-select option { text-align: left; text-align-last: left; background: var(--c-surface); color: var(--c-text); }
|
||||
.matrix td.student-cell { min-width: 12rem; }
|
||||
.student-no-line { display: flex; align-items: center; gap: 0.35rem; }
|
||||
.password-dot { width: 6px; height: 6px; flex: 0 0 auto; background: var(--c-tone-pos); }
|
||||
.password-dot.warn { background: #b45309; }
|
||||
.student-name { font-weight: 600; font-size: 0.84375rem; }
|
||||
.student-cell .font-mono { margin-top: 0.125rem; }
|
||||
.lab-col-head { display: flex; flex-direction: column; align-items: flex-start; gap: 0.375rem; }
|
||||
|
||||
@@ -678,11 +678,12 @@ function submitAttestationForm(form) {
|
||||
if (form.dataset.saving === '1') return;
|
||||
form.dataset.saving = '1';
|
||||
var select = form.querySelector('select[name="value"]');
|
||||
var payload = new FormData(form);
|
||||
if (select) select.disabled = true;
|
||||
|
||||
fetch(form.action, {
|
||||
method: 'POST',
|
||||
body: new FormData(form),
|
||||
body: payload,
|
||||
headers: { 'X-Requested-With': 'fetch' }
|
||||
})
|
||||
.then(function (response) {
|
||||
@@ -769,9 +770,6 @@ document.addEventListener('submit', function (ev) {
|
||||
? 'Аттестация видна студентам — скрыть'
|
||||
: 'Аттестация скрыта — показать студентам';
|
||||
}
|
||||
var head = form.closest('th');
|
||||
var badge = head ? head.querySelector('.js-att-hidden') : null;
|
||||
if (badge) badge.hidden = published;
|
||||
showToast(published ? 'Аттестация открыта студентам' : 'Аттестация скрыта от студентов', 'success');
|
||||
})
|
||||
.catch(function (error) {
|
||||
|
||||
@@ -16,23 +16,6 @@
|
||||
</div>
|
||||
|
||||
<div class="row g-4 mt-4">
|
||||
<div class="col-lg-6">
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<h2 class="section-title m-0">Лабораторные</h2>
|
||||
<a th:href="@{/admin/labs}" class="text-sm">Все лабораторные →</a>
|
||||
</div>
|
||||
<div class="card card-flush">
|
||||
<table>
|
||||
<tbody>
|
||||
<tr th:each="lab : ${labs}">
|
||||
<td><a th:href="@{/admin/labs/{id}(id=${lab.id})}" th:text="|ЛР ${lab.number}. ${lab.title}|">—</a></td>
|
||||
<td class="text-muted" th:text="${lab.variantCount} + ' вар.'">—</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(labs)}"><td class="empty">Лабораторных нет.</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<h2 class="section-title m-0">Группы</h2>
|
||||
@@ -50,6 +33,23 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="flex items-center justify-between mb-4">
|
||||
<h2 class="section-title m-0">Лабораторные</h2>
|
||||
<a th:href="@{/admin/labs}" class="text-sm">Все лабораторные →</a>
|
||||
</div>
|
||||
<div class="card card-flush">
|
||||
<table>
|
||||
<tbody>
|
||||
<tr th:each="lab : ${labs}">
|
||||
<td><a th:href="@{/admin/labs/{id}(id=${lab.id})}" th:text="|ЛР ${lab.number}. ${lab.title}|">—</a></td>
|
||||
<td class="text-muted" th:text="${lab.variantCount} + ' вар.'">—</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(labs)}"><td class="empty">Лабораторных нет.</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -73,9 +73,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<th class="text-center average-col" title="Средний балл по выставленным оценкам">Средний балл</th>
|
||||
<th class="average-col" title="Средний балл по выставленным оценкам">Средний балл</th>
|
||||
<th th:each="att : ${attestations}" class="text-center attestation-col" data-nosort>
|
||||
<div class="attestation-head">
|
||||
<div class="lab-col-head">
|
||||
<div class="attestation-title">
|
||||
<span class="attestation-kind" th:text="${att.shortLabel}">Пр. атт.</span>
|
||||
</div>
|
||||
<span class="lab-col-title" th:text="'Семестр ' + ${att.semester}">Семестр 1</span>
|
||||
<div class="lab-head-actions">
|
||||
<form class="inline-form js-att-pub-form" method="post"
|
||||
th:action="@{/admin/groups/{gid}/attestations/{aid}/publication(gid=${group.id}, aid=${att.id})}">
|
||||
@@ -99,20 +103,21 @@
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
<span class="attestation-kind" th:text="${att.kindLabel}">Аттестация</span>
|
||||
<span class="lab-col-title" th:text="'Семестр ' + ${att.semester}">Семестр 1</span>
|
||||
<span class="badge badge-warn js-att-hidden" th:hidden="${att.published}">скрыто</span>
|
||||
</div>
|
||||
</th>
|
||||
<th data-nosort>Пароль</th>
|
||||
<th class="text-right" data-nosort>Действия</th>
|
||||
<th class="text-right actions-head" data-nosort>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="row : ${studentGrades}">
|
||||
<td class="student-cell matrix-sticky">
|
||||
<div class="student-name" th:text="${row.fullName}">—</div>
|
||||
<div class="text-sm text-muted font-mono" th:text="${row.studentNo}">—</div>
|
||||
<div class="student-no-line">
|
||||
<span class="password-dot" th:classappend="${row.mustChangePassword} ? 'warn' : 'ok'"
|
||||
th:title="${row.mustChangePassword} ? 'Системный пароль — требуется смена' : 'Пароль изменён'"
|
||||
aria-label="Статус пароля"></span>
|
||||
<div class="text-sm text-muted font-mono" th:text="${row.studentNo}">—</div>
|
||||
</div>
|
||||
</td>
|
||||
<td th:each="cell, iterStat : ${row.cells}" class="text-center cell-lab"
|
||||
th:attr="data-lab=${cell.labId},data-sort=${cell.variantNumber},data-filter-label=${cell.variantNumber != null ? 'вариант ' + cell.variantNumber : 'без варианта'}">
|
||||
@@ -154,26 +159,23 @@
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-center average-cell"
|
||||
<td class="average-cell"
|
||||
th:text="${row.averageScore != null ? row.averageScore : '—'}">—</td>
|
||||
<td th:each="att : ${attestations}" class="text-center attestation-cell">
|
||||
<td th:each="att : ${attestations}" class="attestation-cell">
|
||||
<form class="inline-form js-attestation-form" method="post"
|
||||
th:action="@{/admin/groups/{id}/attestation-results(id=${group.id})}">
|
||||
<input type="hidden" name="_csrf" th:value="${csrfToken}">
|
||||
<input type="hidden" name="attestationId" th:value="${att.id}">
|
||||
<input type="hidden" name="studentId" th:value="${row.studentId}">
|
||||
<select class="input attestation-select" name="value" data-auto-submit
|
||||
th:attr="data-student-name=${row.fullName},data-attestation-label=${att.kindLabel}">
|
||||
<select class="attestation-select" name="value" data-auto-submit
|
||||
th:classappend="${row.attestations[att.id] == null} ? 'none' : ''"
|
||||
th:title="${row.fullName} + ' — ' + ${att.kindLabel} + ' (' + 'Семестр ' + ${att.semester} + ')'">
|
||||
<option value="" th:selected="${row.attestations[att.id] == null}">—</option>
|
||||
<option th:each="opt : ${att.options}" th:value="${opt.value}" th:text="${opt.label}"
|
||||
th:selected="${row.attestations[att.id]?.value == opt.value}"></option>
|
||||
</select>
|
||||
</form>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<span th:if="${row.mustChangePassword}" class="badge badge-warn">временный</span>
|
||||
<span th:unless="${row.mustChangePassword}" class="badge badge-ok">изменён</span>
|
||||
</td>
|
||||
<td class="text-right actions-cell">
|
||||
<div class="actions-col">
|
||||
<form th:action="@{/admin/groups/{gid}/students/{sid}/reset-password(gid=${group.id}, sid=${row.studentId})}" method="post" data-confirm="Сбросить пароль студенту? Текущий пароль перестанет работать, новый покажется один раз.">
|
||||
@@ -189,7 +191,7 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(studentGrades)}"><td class="empty" th:attr="colspan=${#lists.size(labs) + #lists.size(attestations) + 4}">В группе нет студентов.</td></tr>
|
||||
<tr th:if="${#lists.isEmpty(studentGrades)}"><td class="empty" th:attr="colspan=${#lists.size(labs) + #lists.size(attestations) + 3}">В группе нет студентов.</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -431,7 +433,7 @@
|
||||
<div class="dlg-body" id="assign-modal-body"></div>
|
||||
</dialog>
|
||||
|
||||
<script th:src="@{/js/admin-group.js(v='41')}" defer></script>
|
||||
<script th:src="@{/js/admin-group.js(v='43')}" defer></script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<!-- v=37: сброс кэша стилей после изменения геометрии; при изменении css поднимать версию -->
|
||||
<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
|
||||
<link rel="stylesheet" th:href="@{/css/bootstrap-icons.min.css}">
|
||||
<link rel="stylesheet" th:href="@{/css/app.css(v='39')}">
|
||||
<link rel="stylesheet" th:href="@{/css/app.css(v='52')}">
|
||||
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='36')}">
|
||||
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='36')}" disabled>
|
||||
<script th:src="@{/js/highlight.min.js(v='36')}" defer></script>
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
<div class="card card-flush">
|
||||
<table>
|
||||
<thead><tr><th>Статья</th><th class="th-w-md" data-nosort>Действия</th></tr></thead>
|
||||
<thead><tr><th>Статья</th><th class="th-w-md" data-nosort th:if="${currentUser != null and currentUser.admin}">Действия</th></tr></thead>
|
||||
<tbody data-article-list>
|
||||
<tr th:each="article : ${section.articles}" th:attr="data-article-id=${article.id}">
|
||||
<td>
|
||||
@@ -55,7 +55,7 @@
|
||||
th:text="${article.title}">—</a>
|
||||
<span th:if="${!article.published}" class="badge badge-warn ml-1">скрыто</span>
|
||||
</td>
|
||||
<td class="text-right actions-cell">
|
||||
<td class="text-right actions-cell" th:if="${currentUser != null and currentUser.admin}">
|
||||
<a class="btn btn-secondary btn-sm p-2" title="Править статью" aria-label="Править статью"
|
||||
th:href="@{/learn/{c}/{s}/{a}(c=${chapter.slug}, s=${section.slug}, a=${article.slug}, edit=1)}"><i class="ico bi bi-pencil" aria-hidden="true"></i></a>
|
||||
<form class="inline-form" th:action="@{/admin/content/articles/toggle-published}" method="post">
|
||||
@@ -73,7 +73,7 @@
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr th:if="${#lists.isEmpty(section.articles)}"><td colspan="2" class="empty">Статей пока нет.</td></tr>
|
||||
<tr th:if="${#lists.isEmpty(section.articles)}"><td th:colspan="${currentUser != null and currentUser.admin} ? 2 : 1" class="empty">Статей пока нет.</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -118,7 +118,7 @@
|
||||
</div>
|
||||
</dialog>
|
||||
|
||||
<dialog id="modal-new-article" class="dlg">
|
||||
<dialog id="modal-new-article" class="dlg" th:if="${currentUser != null and currentUser.admin}">
|
||||
<div class="dlg-header">
|
||||
<h2 class="dlg-title">Новая статья в разделе</h2>
|
||||
<button class="dlg-close" type="button" aria-label="Закрыть">✕</button>
|
||||
@@ -143,7 +143,9 @@
|
||||
</div>
|
||||
</dialog>
|
||||
|
||||
<script th:src="@{/js/content-sort.js(v='36')}" defer></script>
|
||||
<th:block th:if="${currentUser != null and currentUser.admin}">
|
||||
<script th:src="@{/js/content-sort.js(v='36')}" defer></script>
|
||||
</th:block>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package ru.ysu.lms.web.learn
|
||||
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.springframework.mock.web.MockHttpServletRequest
|
||||
import org.springframework.mock.web.MockHttpServletResponse
|
||||
import org.springframework.mock.web.MockServletContext
|
||||
import org.thymeleaf.context.WebContext
|
||||
import org.thymeleaf.spring6.SpringTemplateEngine
|
||||
import org.thymeleaf.templatemode.TemplateMode
|
||||
import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver
|
||||
import org.thymeleaf.web.servlet.JakartaServletWebApplication
|
||||
import ru.ysu.lms.web.session.SessionUser
|
||||
import java.util.Locale
|
||||
|
||||
class LearnSectionTemplateTest {
|
||||
private val engine =
|
||||
SpringTemplateEngine().apply {
|
||||
setTemplateResolver(
|
||||
ClassLoaderTemplateResolver().apply {
|
||||
prefix = "templates/"
|
||||
suffix = ".html"
|
||||
characterEncoding = "UTF-8"
|
||||
templateMode = TemplateMode.HTML
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `student does not see article admin actions`() {
|
||||
val html = render("STUDENT")
|
||||
|
||||
assertThat(html).contains("Статья 1")
|
||||
assertThat(html).doesNotContain("Удалить статью")
|
||||
assertThat(html).doesNotContain("Править статью")
|
||||
assertThat(html).doesNotContain("Скрыть статью")
|
||||
assertThat(html).doesNotContain("modal-new-article")
|
||||
assertThat(html).doesNotContain(">Действия</th>")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `admin sees article actions`() {
|
||||
val html = render("ADMIN")
|
||||
|
||||
assertThat(html).contains("Статья 1")
|
||||
assertThat(html).contains("Удалить статью")
|
||||
assertThat(html).contains("Править статью")
|
||||
assertThat(html).contains("Скрыть статью")
|
||||
assertThat(html).contains("modal-new-article")
|
||||
assertThat(html).contains(">Действия</th>")
|
||||
}
|
||||
|
||||
private fun render(role: String): String {
|
||||
val servletContext = MockServletContext()
|
||||
val application = JakartaServletWebApplication.buildApplication(servletContext)
|
||||
val exchange =
|
||||
application.buildExchange(
|
||||
MockHttpServletRequest(servletContext),
|
||||
MockHttpServletResponse(),
|
||||
)
|
||||
val context = WebContext(exchange, Locale.forLanguageTag("ru"))
|
||||
context.setVariable("csrfToken", "csrf")
|
||||
context.setVariable(
|
||||
"currentUser",
|
||||
SessionUser(
|
||||
id = "user-1",
|
||||
login = role.lowercase(),
|
||||
role = role,
|
||||
name = "Пользователь",
|
||||
mustChangePassword = false,
|
||||
),
|
||||
)
|
||||
context.setVariable(
|
||||
"chapter",
|
||||
mapOf(
|
||||
"slug" to "chapter-1",
|
||||
"title" to "Глава",
|
||||
),
|
||||
)
|
||||
context.setVariable(
|
||||
"section",
|
||||
mapOf(
|
||||
"id" to "section-1",
|
||||
"slug" to "section-1",
|
||||
"title" to "Раздел",
|
||||
"published" to true,
|
||||
"articles" to
|
||||
listOf(
|
||||
mapOf(
|
||||
"id" to "article-1",
|
||||
"title" to "Статья 1",
|
||||
"slug" to "article-1",
|
||||
"published" to true,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
context.setVariable("back", "/learn/chapter-1")
|
||||
context.setVariable("backParent", "/learn")
|
||||
context.setVariable(
|
||||
"sectionChoices",
|
||||
listOf(mapOf("id" to "section-2", "chapterId" to "chapter-1", "label" to "Глава / Раздел 2")),
|
||||
)
|
||||
return engine.process("learn/section", context)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user