From 7fb3e13548f590176ca1eab3f3c23346fb85ffc0 Mon Sep 17 00:00:00 2001
From: Vladislav Kopnin <vlad.kopnen@mail.ru>
Date: Mon, 26 Oct 2026 19:38:13 +0300
Subject: [PATCH] fix: refine attestation column borders and labels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remove doubled left borders and add a single border before password/actions
- narrow attestation columns and fit full grade labels
- use full intermediate attestation labels: отлично, аттестован, неудовлетворительно, не аттестован
- keep the average header left-aligned
---
 .../ru/ysu/lms/web/AttestationPresentation.kt |  8 +++----
 web/src/main/resources/static/css/app.css     | 21 +++++++++++++------
 .../resources/templates/fragments/base.html   |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/web/src/main/kotlin/ru/ysu/lms/web/AttestationPresentation.kt b/web/src/main/kotlin/ru/ysu/lms/web/AttestationPresentation.kt
index 47c4b51..c681712 100644
--- a/web/src/main/kotlin/ru/ysu/lms/web/AttestationPresentation.kt
+++ b/web/src/main/kotlin/ru/ysu/lms/web/AttestationPresentation.kt
@@ -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(
diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index 7f40c6b..a78d61b 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -567,20 +567,29 @@ dialog.dlg.dlg-lg .dlg-body { max-height: 88vh; min-height: 62vh; }
 #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: 11rem; min-width: 10rem; max-width: 11rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); }
-.matrix td.attestation-cell { width: 11rem; min-width: 10rem; max-width: 11rem; 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; }
+.matrix th.attestation-col,
+.matrix td.attestation-cell {
+    width: 10rem; min-width: 9.5rem; max-width: 10rem;
+    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; }
+.matrix th.password-col,
+.matrix td.password-cell { border-left: 1px solid var(--c-border); }
 .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: flex-start; width: 100%; }
 .attestation-select {
     appearance: none; -webkit-appearance: none;
-    width: 9rem; max-width: 100%; min-width: 0; padding: 0.15rem 1.15rem 0.15rem 0.35rem;
+    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.8125rem; font-weight: 600; font-variant-numeric: tabular-nums;
+    font-size: 0.7rem; font-weight: 600; font-variant-numeric: tabular-nums;
     text-align: left; text-align-last: left; cursor: pointer;
     background-image:
         linear-gradient(45deg, transparent 50%, currentColor 50%),
diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html
index 62dfb22..6ab66f1 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/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='45')}">
+        <link rel="stylesheet" th:href="@{/css/app.css(v='47')}">
     <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>