From 794c2989a0fdefc74cd3fcb144adafc97116c707 Mon Sep 17 00:00:00 2001
From: Vladislav Kopnin <vlad.kopnen@mail.ru>
Date: Thu, 8 Oct 2026 10:28:34 +0300
Subject: [PATCH] Variant distribution: treat redirect as success, refresh
 modal in place, toasts above modal (inside dialog); asset v32

---
 web/src/main/resources/static/css/app.css     |  2 +-
 .../main/resources/static/js/admin-group.js   | 26 ++++++++++++++++---
 .../main/resources/templates/admin/group.html | 13 +++++-----
 .../main/resources/templates/admin/lab.html   |  2 +-
 .../resources/templates/fragments/base.html   | 24 ++++++++---------
 .../resources/templates/learn/article.html    |  2 +-
 .../resources/templates/learn/chapter.html    |  2 +-
 .../main/resources/templates/learn/index.html |  4 +--
 .../resources/templates/learn/section.html    |  2 +-
 .../main/resources/templates/student/lab.html |  2 +-
 10 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index e43f0d3..5ea7b4e 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -468,7 +468,7 @@ 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; flex-wrap: wrap; align-items: center; gap: 0.25rem; }
+.lab-head-actions { display: flex; gap: 0.2rem; }
 .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;
diff --git a/web/src/main/resources/static/js/admin-group.js b/web/src/main/resources/static/js/admin-group.js
index a87776a..6097e37 100644
--- a/web/src/main/resources/static/js/admin-group.js
+++ b/web/src/main/resources/static/js/admin-group.js
@@ -209,7 +209,20 @@ function attachCommentAutocomplete(input) {
 /* ---------- Удаление подсказки комментария и всплывающие уведомления ---------- */
 
 function showToast(text, kind) {
-    var host = $id('toast-host');
+    // уведомления должны быть видны поверх открытой модалки: кладём их в сам <dialog>
+    // (элемент верхнего слоя), иначе они оказываются под ним
+    var dlg = document.querySelector('dialog[open]');
+    var host = null;
+    if (dlg) {
+        host = dlg.querySelector('.toast-host');
+        if (!host) {
+            host = document.createElement('div');
+            host.className = 'toast-host';
+            dlg.appendChild(host);
+        }
+    } else {
+        host = $id('toast-host');
+    }
     if (!host) return;
     var toast = document.createElement('div');
     toast.className = 'toast-item ' + (kind === 'error' ? 'toast-error' : 'toast-success');
@@ -663,8 +676,15 @@ document.addEventListener('submit', function (ev) {
     var btn = form.querySelector('button[type="submit"]');
     if (btn) btn.disabled = true;
     fetch(form.action, { method: 'POST', body: new FormData(form), headers: { 'X-Requested-With': 'fetch' } })
-        .then(function (r) { if (r.redirected) throw new Error('сессия истекла — обновите страницу'); return r.text(); })
-        .then(function () { return refreshAssignModal(form.getAttribute('data-refresh')); })
+        .then(function (r) { if (!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
+        .then(function (html) {
+            // эндпоинты отвечают редиректом на страницу лабы — это норма, не ошибка;
+            // flash-сообщение забираем из отданного HTML
+            var err = /<div[^>]*class="[^"]*toast-item toast-error[^"]*"[^>]*>\s*<span class="toast-text">([^<]*)</.exec(html);
+            var ok = /<span class="toast-text">([^<]*)<\/span>/.exec(html);
+            showToast(err ? err[1].trim() : (ok ? ok[1].trim() : 'Сохранено'), err ? 'error' : 'success');
+            return refreshAssignModal(form.getAttribute('data-refresh'));
+        })
         .catch(function (e) { showToast('Не удалось сохранить: ' + e.message, 'error'); })
         .finally(function () { if (btn) btn.disabled = false; });
 });
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index edaf529..399cb12 100644
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -44,10 +44,10 @@
                             <a th:href="@{/admin/labs/{id}(id=${lab.id})}" th:text="|ЛР ${lab.number}|">ЛР</a>
                             <span class="lab-col-title" th:text="${lab.title}">—</span>
                             <div class="lab-head-actions">
-                                <button class="btn btn-primary btn-sm" type="button"
+                                <button class="btn btn-secondary btn-sm p-2" type="button"
                                         th:attr="data-url=@{/admin/groups/{id}/assign-modal(id=${group.id}, labId=${lab.id})},data-lab-name=|ЛР ${lab.number}|" data-action="assign"
-                                        title="Раздать варианты студентам: уровни, варианты, автокраспределение по группе">
-                                    <i class="bi bi-people" aria-hidden="true"></i> Варианты
+                                        title="Выдача вариантов: уровни, варианты, автокраспределение по группе">
+                                    <i class="cell-ico ico bi bi-list" aria-hidden="true"></i>
                                 </button>
                                 <form class="inline-form" th:with="pub=${labPublication[lab.id]}, pc=${pub != null ? pub.publishedCount : 0}, all=${pub != null and pub.allPublished}"
                                       th:action="@{/admin/groups/{id}/publish(id=${group.id})}" method="post">
@@ -64,10 +64,9 @@
                                         <span class="mini-count js-pub-count" th:classappend="(${all} or ${pc == 0}) ? 'is-hidden' : ''" th:text="${pc}"></span>
                                     </button>
                                 </form>
-                                <a class="btn btn-secondary btn-sm"
+                                <a class="btn btn-secondary btn-sm p-2"
                                    th:href="'/admin/groups/' + ${group.id} + '/submissions.zip?labId=' + ${lab.id}"
-                                   th:title="|Скачать решения по ЛР ${lab.number}|">
-                                    <i class="bi bi-download" aria-hidden="true"></i><span class="mini-count" th:text="${labSubmissionCounts[lab.id] ?: 0}">0</span></a>
+                                   th:title="|Скачать решения по ЛР ${lab.number}|">⤓<span class="mini-count" th:text="${labSubmissionCounts[lab.id] ?: 0}">0</span></a>
                             </div>
                         </div>
                     </th>
@@ -343,7 +342,7 @@
     <div class="dlg-body" id="assign-modal-body"></div>
 </dialog>
 
-<script th:src="@{/js/admin-group.js(v='30')}" defer></script>
+<script th:src="@{/js/admin-group.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/admin/lab.html b/web/src/main/resources/templates/admin/lab.html
index c04349f..0a59d6d 100644
--- a/web/src/main/resources/templates/admin/lab.html
+++ b/web/src/main/resources/templates/admin/lab.html
@@ -196,7 +196,7 @@
             </dialog>
         </th:block>
     </div>
-    <script th:src="@{/js/admin-lab.js(v='30')}" defer></script>
+    <script th:src="@{/js/admin-lab.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html
index e21af28..1f653a7 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/web/src/main/resources/templates/fragments/base.html
@@ -13,22 +13,22 @@
     <noscript>
         <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     </noscript>
-    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='30')}">
+    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='32')}">
     <!-- v=4: сброс кэша стилей после редизайна; при изменении 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='30')}">
-    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='30')}">
-    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='30')}" disabled>
-    <script th:src="@{/js/highlight.min.js(v='30')}" defer></script>
-    <script th:src="@{/js/table-scroll.js(v='30')}" defer></script>
-    <script th:src="@{/js/tablekit.js(v='30')}" defer></script>
+        <link rel="stylesheet" th:href="@{/css/app.css(v='32')}">
+    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='32')}">
+    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='32')}" disabled>
+    <script th:src="@{/js/highlight.min.js(v='32')}" defer></script>
+    <script th:src="@{/js/table-scroll.js(v='32')}" defer></script>
+    <script th:src="@{/js/tablekit.js(v='32')}" defer></script>
     <script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
-    <script th:src="@{/js/theme-init.js(v='30')}"></script>
-    <script th:src="@{/js/app.js(v='30')}" defer></script>
-    <script th:src="@{/js/ui-state.js(v='30')}" defer></script>
-    <script th:src="@{/js/md-content.js(v='30')}" defer></script>
-    <script th:src="@{/js/submit-guard.js(v='30')}" defer></script>
+    <script th:src="@{/js/theme-init.js(v='32')}"></script>
+    <script th:src="@{/js/app.js(v='32')}" defer></script>
+    <script th:src="@{/js/ui-state.js(v='32')}" defer></script>
+    <script th:src="@{/js/md-content.js(v='32')}" defer></script>
+    <script th:src="@{/js/submit-guard.js(v='32')}" defer></script>
 </head>
 <body>
 <div class="page d-flex flex-column min-vh-100">
diff --git a/web/src/main/resources/templates/learn/article.html b/web/src/main/resources/templates/learn/article.html
index fed6351..bb1b0a6 100644
--- a/web/src/main/resources/templates/learn/article.html
+++ b/web/src/main/resources/templates/learn/article.html
@@ -138,7 +138,7 @@
         </div>
 
 
-    <script th:src="@{/js/mdeditor.js(v='30')}" defer></script>
+    <script th:src="@{/js/mdeditor.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/chapter.html b/web/src/main/resources/templates/learn/chapter.html
index b50fab1..a72c62f 100644
--- a/web/src/main/resources/templates/learn/chapter.html
+++ b/web/src/main/resources/templates/learn/chapter.html
@@ -183,7 +183,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='30')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/index.html b/web/src/main/resources/templates/learn/index.html
index 20fa75f..ad1b7f9 100644
--- a/web/src/main/resources/templates/learn/index.html
+++ b/web/src/main/resources/templates/learn/index.html
@@ -236,8 +236,8 @@
         </div>
     </dialog>
 
-<script th:src="@{/js/mdeditor.js(v='30')}" defer></script>
-<script th:src="@{/js/content-sort.js(v='30')}" defer></script>
+<script th:src="@{/js/mdeditor.js(v='32')}" defer></script>
+<script th:src="@{/js/content-sort.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/section.html b/web/src/main/resources/templates/learn/section.html
index e24b5d7..1a21d32 100644
--- a/web/src/main/resources/templates/learn/section.html
+++ b/web/src/main/resources/templates/learn/section.html
@@ -143,7 +143,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='30')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='32')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/student/lab.html b/web/src/main/resources/templates/student/lab.html
index 1d92fcc..20d8e14 100644
--- a/web/src/main/resources/templates/student/lab.html
+++ b/web/src/main/resources/templates/student/lab.html
@@ -107,7 +107,7 @@
             <p class="text-sm text-muted">Ожидайте преподавателя с проверкой.</p>
         </div>
     </div>
-<script th:src="@{/js/defense-timer.js(v='30')}" defer></script>
+<script th:src="@{/js/defense-timer.js(v='32')}" defer></script>
 </div>
 </body>
 </html>