From 1f89838f161a1aa070045ff92cbdd07f7b6ced0b Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Mon, 5 Feb 2024 15:59:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=94:=20P8PDataGrid=20-=20=D0=B2=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B5=D0=BD=D0=B0=20=D1=83=D0=BD=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=20?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B3=D1=80?=
 =?UTF-8?q?=D1=83=D0=BF=D0=BF=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/PKG_P8PANELS_VISUAL.pck | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/db/PKG_P8PANELS_VISUAL.pck b/db/PKG_P8PANELS_VISUAL.pck
index 67c1f1b..4fdff3a 100644
--- a/db/PKG_P8PANELS_VISUAL.pck
+++ b/db/PKG_P8PANELS_VISUAL.pck
@@ -951,17 +951,35 @@ text="Формат data_grid и gant как в chart"
     BCLEAR                  in boolean := false    -- Флаг очистки коллекции (false - не очищать, true - очистить коллекцию перед добавлением)
   )
   is
+    BFND                    boolean := false;      -- Флаг наличия группы в коллекции
   begin
     /* Инициализируем коллекцию если необходимо */
     if ((RGROUPS is null) or (BCLEAR)) then
       RGROUPS := TGROUPS();
     end if;
-    /* Добавляем элемент */
-    RGROUPS.EXTEND();
-    RGROUPS(RGROUPS.LAST) := TGROUP_MAKE(SNAME       => SNAME,
-                                         SCAPTION    => SCAPTION,
-                                         BEXPANDABLE => BEXPANDABLE,
-                                         BEXPANDED   => BEXPANDED);
+    /* Проверим наличие */
+    if (RGROUPS.COUNT > 0) then
+      for I in RGROUPS.FIRST .. RGROUPS.LAST
+      loop
+        if (RGROUPS(I).SNAME = SNAME) then
+          /* Элемент найден - обновим */
+          BFND := true;
+          RGROUPS(I) := TGROUP_MAKE(SNAME       => SNAME,
+                                    SCAPTION    => SCAPTION,
+                                    BEXPANDABLE => BEXPANDABLE,
+                                    BEXPANDED   => BEXPANDED);
+          exit;
+        end if;
+      end loop;
+    end if;
+    /* Добавляем элемент если такого нет */
+    if (not BFND) then
+      RGROUPS.EXTEND();
+      RGROUPS(RGROUPS.LAST) := TGROUP_MAKE(SNAME       => SNAME,
+                                           SCAPTION    => SCAPTION,
+                                           BEXPANDABLE => BEXPANDABLE,
+                                           BEXPANDED   => BEXPANDED);
+    end if;
   end TGROUPS_ADD;
   
   /* Сериализация описания групп таблицы данных */