From 68fc499ac9135d747be8d7c75a4ec3a7d27ce391 Mon Sep 17 00:00:00 2001
From: Moldabayev_d <Moldabayev_d@users.noreply.git.vibe42.kz>
Date: Mon, 21 Sep 2026 09:19:19 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20S?=
 =?UTF-8?q?.zone=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B1=D0=B5=D0=B7=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0,=20zoneLabel=20=E2=80=94?=
 =?UTF-8?q?=20=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0,=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=20=E2=80=94=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20map?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kfu-client.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/kfu-client.js b/kfu-client.js
index 898a3b6..00e9a47 100644
--- a/kfu-client.js
+++ b/kfu-client.js
@@ -512,7 +512,7 @@
     return w;
   }
   function zoneLabel(z) {
-    return { green: "В норме", yellow: "Наблюдение", red: "Нарушение", nodefault: "Без норматива", nodata: "Нет данных" }[z] || z;
+    return { green: "Зелёная", yellow: "Жёлтая", red: "Красная", nodefault: "Без норматива", nodata: "Нет данных" }[z] || z;
   }
 
   /* ---------- учебный (синтетический) пример ---------- */
@@ -591,7 +591,8 @@
   }
   function statusHtml(zone) {
     var cls = { green: "s-green", yellow: "s-yellow", red: "s-red", nodefault: "s-nodefault", nodata: "s-nodata" }[zone] || "s-nodata";
-    return "<span class='kfu-status " + cls + "'>" + zoneLabel(zone) + "</span>";
+    var screenLabel = { green: "В норме", yellow: "Наблюдение", red: "Нарушение", nodefault: "Без норматива", nodata: "Нет данных" }[zone] || zone;
+    return "<span class='kfu-status " + cls + "'>" + screenLabel + "</span>";
   }
   function coefCell(e, key) {
     var v = e[key];
@@ -743,14 +744,17 @@
 
     renderDiag();
 
-    /* компании (без группы) */
-    var filtered = S.q ? comps.filter(function (e) {
-      if (e.name.toLowerCase().indexOf(S.q.toLowerCase()) === -1) return false;
-      var wz = worst(e);
-      if (!S.zone) return true;
-      if (S.zone === "nodefault") return wz === "nodefault";
-      return wz === S.zone;
-    }) : comps;
+    /* компании (без группы): поиск и зона комбинируются независимо */
+    var q = (S.q || "").toLowerCase();
+    var filtered = comps.filter(function (e) {
+      if (q && e.name.toLowerCase().indexOf(q) === -1) return false;
+      if (S.zone) {
+        var wz = worst(e);
+        if (S.zone === "nodefault") return wz === "nodefault";
+        return wz === S.zone;
+      }
+      return true;
+    });
     filtered = filterSortList(filtered);
     var body = $("#tbody");
     if (!filtered.length) {