From ba4914d368c1b0fa7a45858936bde99c63e89c0d Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 29 Feb 2024 21:27:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=94:=20P8PGantt=20-=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B0=20=D0=B7=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9=20=D0=BC=D0=B0?= =?UTF-8?q?=D1=81=D1=81=D0=B8=D0=B2=D0=BE=D0=BC=20(=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=D0=B3=D0=B4=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/PKG_P8PANELS_VISUAL.pck | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/db/PKG_P8PANELS_VISUAL.pck b/db/PKG_P8PANELS_VISUAL.pck index 6be69c8..342fb69 100644 --- a/db/PKG_P8PANELS_VISUAL.pck +++ b/db/PKG_P8PANELS_VISUAL.pck @@ -1805,8 +1805,7 @@ text="Формат data_grid и gant как в chart" ( RTASKS in TGANTT_TASKS -- Коллекция задач диаграммы Ганта ) - is - SDEPS PKG_STD.TLSTRING; -- Буфер для списка зависимых + is begin /* Обходим задачи из коллекции */ if ((RTASKS is not null) and (RTASKS.COUNT > 0)) then @@ -1843,14 +1842,6 @@ text="Формат data_grid и gant как в chart" if (RTASKS(I).BREAD_ONLY_PROGRESS is not null) then PKG_XFAST.ATTR(SNAME => SRESP_ATTR_TASK_RO_PRGRS, BVALUE => RTASKS(I).BREAD_ONLY_PROGRESS); end if; - if ((RTASKS(I).RDEPENDENCIES is not null) and (RTASKS(I).RDEPENDENCIES.COUNT > 0)) then - SDEPS := null; - for J in RTASKS(I).RDEPENDENCIES.FIRST .. RTASKS(I).RDEPENDENCIES.LAST - loop - SDEPS := COALESCE(SDEPS, '') || 'taskId' || TO_CHAR(RTASKS(I).RDEPENDENCIES(J)) || ','; - end loop; - PKG_XFAST.ATTR(SNAME => SRESP_ATTR_TASK_DEPS, SVALUE => RTRIM(SDEPS, ',')); - end if; /* Динамические атрибуты */ if ((RTASKS(I).RATTR_VALS is not null) and (RTASKS(I).RATTR_VALS.COUNT > 0)) then for J in RTASKS(I).RATTR_VALS.FIRST .. RTASKS(I).RATTR_VALS.LAST @@ -1858,6 +1849,15 @@ text="Формат data_grid и gant как в chart" PKG_XFAST.ATTR(SNAME => RTASKS(I).RATTR_VALS(J).SNAME, SVALUE => RTASKS(I).RATTR_VALS(J).SVALUE); end loop; end if; + /* Зависимости */ + if ((RTASKS(I).RDEPENDENCIES is not null) and (RTASKS(I).RDEPENDENCIES.COUNT > 0)) then + for J in RTASKS(I).RDEPENDENCIES.FIRST .. RTASKS(I).RDEPENDENCIES.LAST + loop + PKG_XFAST.DOWN_NODE(SNAME => SRESP_ATTR_TASK_DEPS); + PKG_XFAST.VALUE(SVALUE => 'taskId' || TO_CHAR(RTASKS(I).RDEPENDENCIES(J))); + PKG_XFAST.UP(); + end loop; + end if; /* Закрываем задачу */ PKG_XFAST.UP(); end loop;