fix: polish attestation columns and inline grading

- use numeric semesters 1–8 and add show/hide publication per attestation
- edit attestation results directly in the group table without a modal
- hide unpublished attestations from students
- align header separators, average column and action buttons with the existing UI
- remove missed-hours fields until a separate attendance model is ready

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

@@ -16,7 +16,9 @@
             </p>
         </div>
         <div class="actions">
-            <a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">Скачать пароли</a>
+            <a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">
+                <i class="cell-ico ico bi bi-download" aria-hidden="true"></i> Пароли
+            </a>
             <button class="btn btn-secondary" type="button" data-modal="modal-add-attestation">+ Аттестация</button>
             <button class="btn" type="button" data-modal="modal-add-student">+ Студент</button>
         </div>
@@ -71,21 +73,35 @@
                             </div>
                         </div>
                     </th>
-                    <th class="text-center" title="Средний балл по выставленным оценкам">Средний балл</th>
+                    <th class="text-center average-col" title="Средний балл по выставленным оценкам">Средний балл</th>
                     <th th:each="att : ${attestations}" class="text-center attestation-col" data-nosort>
                         <div class="attestation-head">
                             <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})}">
+                                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
+                                    <input type="hidden" name="published" th:value="${!att.published}">
+                                    <button class="btn btn-secondary btn-sm p-2 js-pub-eye js-att-pub" type="submit"
+                                            th:classappend="${att.published} ? 'is-all' : 'is-empty'"
+                                            th:title="${att.published} ? 'Аттестация видна студентам — скрыть' : 'Аттестация скрыта — показать студентам'">
+                                        <i class="eye-open ico bi bi-eye" aria-hidden="true"></i>
+                                        <i class="eye-closed ico bi bi-eye-slash" aria-hidden="true"></i>
+                                    </button>
+                                </form>
                                 <form class="inline-form"
                                       th:action="@{/admin/groups/{gid}/attestations/{aid}/delete(gid=${group.id}, aid=${att.id})}"
                                       method="post"
                                       data-confirm="Удалить столбец аттестации вместе со всеми результатами?">
                                     <input type="hidden" name="_csrf" th:value="${csrfToken}">
                                     <button class="btn btn-danger btn-sm p-2" type="submit"
-                                            title="Удалить аттестацию" aria-label="Удалить аттестацию">✕</button>
+                                            title="Удалить аттестацию" aria-label="Удалить аттестацию">
+                                        <i class="cell-ico ico bi bi-trash" aria-hidden="true"></i>
+                                    </button>
                                 </form>
                             </div>
                             <span class="attestation-kind" th:text="${att.kindLabel}">Аттестация</span>
-                            <span class="lab-col-title" th:text="${att.semester}">—</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>
@@ -138,18 +154,21 @@
                             </div>
                         </div>
                     </td>
-                    <td class="text-center font-mono average-cell"
+                    <td class="text-center average-cell"
                         th:text="${row.averageScore != null ? row.averageScore : '—'}">—</td>
                     <td th:each="att : ${attestations}" class="text-center attestation-cell">
-                        <button class="score-link" type="button"
-                                th:classappend="${row.attestations[att.id] == null} ? 'none' : ''"
-                                th:attr="data-student=${row.studentId},data-student-name=${row.fullName},data-attestation=${att.id},data-attestation-kind=${att.kind},data-attestation-value=${row.attestations[att.id]?.value},data-missed-hours=${row.attestations[att.id]?.missedHours},data-attestation-label=${att.kindLabel},data-semester=${att.semester}"
-                                data-action="attestation"
-                                th:title="${att.kindLabel} + ' — ' + ${att.semester}">
-                            <span th:text="${row.attestations[att.id] != null ? row.attestations[att.id].label : '—'}">—</span>
-                            <span th:if="${row.attestations[att.id]?.missedHours != null}"
-                                  class="cell-sub" th:text="' (' + ${row.attestations[att.id].missedHours} + ' ч.)'"></span>
-                        </button>
+                        <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}">
+                                <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>
@@ -220,48 +239,24 @@
                     <option value="exam">Экзамен</option>
                 </select></div>
             <div><label class="label" for="attestation-semester">Семестр</label>
-                <input class="input" id="attestation-semester" name="semester" list="attestation-semesters"
-                       placeholder="осень 2026" maxlength="100" data-error-required="Укажите семестр" required>
-                <datalist id="attestation-semesters">
-                    <option th:each="s : ${attestationSemesters}" th:value="${s}"></option>
-                </datalist>
-                <p class="hint">Например: «осень 2026» или «весна 2027». Семестр будет указан в ведомости и кабинете студента.</p>
+                <select class="input" id="attestation-semester" name="semester" required
+                        data-error-required="Укажите семестр от 1 до 8">
+                    <option value="1">Семестр 1</option>
+                    <option value="2">Семестр 2</option>
+                    <option value="3">Семестр 3</option>
+                    <option value="4">Семестр 4</option>
+                    <option value="5">Семестр 5</option>
+                    <option value="6">Семестр 6</option>
+                    <option value="7">Семестр 7</option>
+                    <option value="8">Семестр 8</option>
+                </select>
+                <p class="hint">Номер семестра от 1 до 8. Он будет указан в ведомости и кабинете студента.</p>
             </div>
             <button class="btn btn-primary" type="submit">Добавить столбец</button>
         </form>
     </div>
 </dialog>
 
-<!-- Диалог: результат аттестации студента -->
-<dialog id="modal-attestation" class="dlg">
-    <div class="dlg-header">
-        <h2 class="dlg-title" id="attestation-title">Результат аттестации</h2>
-        <button class="dlg-close" type="button" aria-label="Закрыть">✕</button>
-    </div>
-    <div class="dlg-body">
-        <form class="form-stack" id="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" id="attestation-id">
-            <input type="hidden" name="studentId" id="attestation-student">
-            <div><label class="label">Студент</label>
-                <input class="input" id="attestation-who" readonly></div>
-            <div><label class="label" for="attestation-value">Результат</label>
-                <select class="input" id="attestation-value" name="value">
-                    <option value="">— не выставлено —</option>
-                </select>
-                <p class="hint">Оставьте пустым, чтобы убрать результат.</p>
-            </div>
-            <div id="attestation-hours-wrap"><label class="label" for="attestation-hours">Пропущено академических часов</label>
-                <input class="input" id="attestation-hours" name="missedHours" type="number" min="0" step="1"
-                       inputmode="numeric" placeholder="например, 24">
-                <p class="hint">Укажите для оценки «не атт», если известны пропуски по любой причине.</p>
-            </div>
-            <button class="btn btn-primary" type="submit">Сохранить</button>
-        </form>
-    </div>
-</dialog>
-
 <!-- Диалог: индивидуальное задание (защита) -->
 <!-- Диалог: назначение варианта -->
 <dialog id="modal-variant" class="dlg dlg-lg">
@@ -436,7 +431,7 @@
     <div class="dlg-body" id="assign-modal-body"></div>
 </dialog>
 
-<script th:src="@{/js/admin-group.js(v='40')}" defer></script>
+<script th:src="@{/js/admin-group.js(v='41')}" defer></script>
 </div>
 </body>
 </html>

web/src/main/resources/templates/fragments/base.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='38')}">
+        <link rel="stylesheet" th:href="@{/css/app.css(v='39')}">
     <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>
@@ -25,7 +25,7 @@
     <script th:src="@{/js/tablekit.js(v='38')}" defer></script>
     <script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
     <script th:src="@{/js/theme-init.js(v='36')}"></script>
-    <script th:src="@{/js/app.js(v='39')}" defer></script>
+    <script th:src="@{/js/app.js(v='40')}" defer></script>
     <script th:src="@{/js/ui-state.js(v='36')}" defer></script>
     <script th:src="@{/js/form-feedback.js(v='39')}" defer></script>
     <script th:src="@{/js/modal-ajax.js(v='1')}" defer></script>

web/src/main/resources/templates/student/dashboard.html

@@ -28,18 +28,17 @@
     <div th:if="${!#lists.isEmpty(attestations)}" class="card card-flush mb-6">
         <table>
             <thead>
-            <tr><th>Форма аттестации</th><th>Семестр</th><th>Результат</th><th>Пропущено</th></tr>
+            <tr><th>Форма аттестации</th><th>Семестр</th><th>Результат</th></tr>
             </thead>
             <tbody>
             <tr th:each="a : ${attestations}">
                 <td th:text="${a.kindLabel}">—</td>
-                <td th:text="${a.semester}">—</td>
+                <td th:text="'Семестр ' + ${a.semester}">—</td>
                 <td>
                     <span class="badge"
                           th:classappend="${a.positive == true} ? 'badge-ok' : (${a.positive == false} ? 'badge-warn' : '')"
                           th:text="${a.valueLabel}">—</span>
                 </td>
-                <td class="text-muted" th:text="${a.missedHours != null ? a.missedHours + ' ч.' : '—'}">—</td>
             </tr>
             </tbody>
         </table>