From 10a1c210a34dad36d62175d7ce45fcf32edd401c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=B8=D0=BD?= <igor_26reg@mail.ru>
Date: Mon, 23 Feb 2026 13:07:59 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=80=D1=8F=20vs=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=B0=20=D0=B2=20=D0=B4=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8F=D1=85=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/components/calendarWidget.js    | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/backend/static/js/components/calendarWidget.js b/backend/static/js/components/calendarWidget.js
index 7d9bad5d..6402dd91 100644
--- a/backend/static/js/components/calendarWidget.js
+++ b/backend/static/js/components/calendarWidget.js
@@ -147,6 +147,7 @@ export function initCalendarWidget(options = {}) {
     loc: document.getElementById("detailLocation"),
     desc: document.getElementById("detailDescription"),
     scope: document.getElementById("detailScope"),
+    scopeWrapper: document.getElementById("detailScopeWrapper"),
     rec: document.getElementById("detailRecurrence"),
     dot: document.getElementById("detailColorDot"),
     createdBy: document.getElementById("detailCreatedBy"),
@@ -167,12 +168,12 @@ export function initCalendarWidget(options = {}) {
     $dt.when.textContent = fmtWhen(ev);
     $dt.loc.textContent = ev.location || "—";
     $dt.desc.textContent = ev.description || "—";
-    $dt.scope.textContent = ev.department
-      ? `Отдел: ${ev.department.name || ev.department}`
-      : "Компания";
+
+    // Повторение
     $dt.rec.textContent = ev.recurrence_interval
       ? `${ev.recurrence} ×${ev.recurrence_interval}`
       : ev.recurrence || "—";
+
     const col = ev.color || DEFAULT_EVENT_COLOR;
     if ($dt.dot) $dt.dot.style.backgroundColor = col;
 
@@ -204,19 +205,28 @@ export function initCalendarWidget(options = {}) {
     }
 
     // Информация о календаре
+    // Приоритет: новый календарь > legacy (department/employee)
     if ($dt.calendar && $dt.calendarWrapper) {
       if (ev.calendar_title) {
+        // Событие из нового календаря
         $dt.calendar.textContent = ev.calendar_title;
         $dt.calendarWrapper.style.display = "";
-      } else if (ev.department) {
-        $dt.calendar.textContent = `Календарь отдела: ${ev.department.name || ev.department}`;
-        $dt.calendarWrapper.style.display = "";
-      } else if (ev.employee) {
-        $dt.calendar.textContent = "Личный календарь";
-        $dt.calendarWrapper.style.display = "";
+        // Скрываем старое поле "Контекст"
+        if ($dt.scopeWrapper) $dt.scopeWrapper.style.display = "none";
       } else {
-        $dt.calendar.textContent = "Календарь компании";
-        $dt.calendarWrapper.style.display = "";
+        // Legacy событие - скрываем новое поле "Календарь"
+        $dt.calendarWrapper.style.display = "none";
+        // Показываем старое поле "Контекст"
+        if ($dt.scope && $dt.scopeWrapper) {
+          if (ev.department) {
+            $dt.scope.textContent = `Отдел: ${ev.department.name || ev.department}`;
+          } else if (ev.employee) {
+            $dt.scope.textContent = "Личный календарь";
+          } else {
+            $dt.scope.textContent = "Компания";
+          }
+          $dt.scopeWrapper.style.display = "";
+        }
       }
     }
   }