From 6196caf9b921a1e3d4f5c557650be0c6406ec5bf Mon Sep 17 00:00:00 2001 From: Dollerino Date: Wed, 29 Jul 2026 18:51:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-980,=20=D0=A6=D0=98?= =?UTF-8?q?=D0=A2=D0=9A-1020=20-=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BE=D0=B1=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=91=D0=94,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20P8PDataGrid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/p8p_data_grid.js | 14 +- app/components/p8p_table.js | 14 +- db/PKG_P8PANELS_CLNTTSKBRD.pck | 56 ++--- db/PKG_P8PANELS_EQUIPSRV.pck | 40 ++-- db/PKG_P8PANELS_MECHREC.pck | 284 ++++++++++++------------ db/PKG_P8PANELS_PROJECTS.pck | 380 ++++++++++++++++---------------- db/PKG_P8PANELS_RRPCONFED.pck | 4 +- db/PKG_P8PANELS_SAMPLES.pck | 24 +- db/PKG_P8PANELS_SETTINGS.pck | 28 +-- db/PKG_P8PANELS_VISUAL.pck | 124 +++++++++++ 10 files changed, 553 insertions(+), 415 deletions(-) diff --git a/app/components/p8p_data_grid.js b/app/components/p8p_data_grid.js index 312e5db..69adf5b 100644 --- a/app/components/p8p_data_grid.js +++ b/app/components/p8p_data_grid.js @@ -14,6 +14,7 @@ import { P8P_TABLE_SIZE, P8P_TABLE_DATA_TYPE, P8P_TABLE_FILTER_SHAPE, + P8P_TABLE_ORDER_SHAPE, P8P_TABLE_MORE_HEIGHT, P8P_TABLE_FILTERS_HEIGHT, P8P_TABLE_PAGINATOR_ALIGN, @@ -34,6 +35,9 @@ const P8P_DATA_GRID_DATA_TYPE = P8P_TABLE_DATA_TYPE; //Формат фильтра const P8P_DATA_GRID_FILTER_SHAPE = P8P_TABLE_FILTER_SHAPE; +//Формат сортировки +const P8P_DATA_GRID_ORDER_SHAPE = P8P_TABLE_ORDER_SHAPE; + //Высота кнопки догрузки данных const P8P_DATA_GRID_MORE_HEIGHT = P8P_TABLE_MORE_HEIGHT; @@ -56,6 +60,7 @@ const P8PDataGrid = ({ tableStyle = {}, columnsDef = [], filtersInitial, + ordersInitial, groups = [], rows = [], size, @@ -94,7 +99,7 @@ const P8PDataGrid = ({ objectsCopier }) => { //Собственное состояние - сортировки - const [orders, setOrders] = useState([]); + const [orders, setOrders] = useState(ordersInitial || []); //Собственное состояние - фильтры const [filters, setFilters] = useState(filtersInitial || []); @@ -137,6 +142,11 @@ const P8PDataGrid = ({ setFilters(filtersInitial || []); }, [filtersInitial]); + //При изменении списка установленных извне сортировок + useEffect(() => { + setOrders(ordersInitial || []); + }, [ordersInitial]); + //Генерация содержимого return ( RDG, SNAME => SDP_PREF || SDP_CODE, SCAPTION => SDP_NAME, - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); else PKG_P8PANELS_VISUAL.TDG_ROW_ADD_CUR_COLS(RROW => RDG_ROW, @@ -727,135 +727,135 @@ create or replace package body PKG_P8PANELS_CLNTTSKBRD as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер записи', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCRN', SCAPTION => 'Каталог', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'BYEV_CRN', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEVPREF', SCAPTION => 'Префикс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEVNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPREF_NUMB', SCAPTION => 'Префикс и номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEVTYPE', SCAPTION => 'Тип события (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEVTYPE_CODE', SCAPTION => 'Тип события', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'BYEV_TYPE', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DREG_DATE', SCAPTION => 'Дата регистрации', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DCHANGE_DATE', SCAPTION => 'Дата последнего изменения', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DEXPIRE_DATE', SCAPTION => 'Дата истечения времени нахождения в точке маршрута', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DPLAN_DATE', SCAPTION => 'Дата начала работ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NINIT_PERSON', SCAPTION => 'Инициализатор (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SINIT_PERSON', SCAPTION => 'Инициализатор', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEVSTAT', SCAPTION => 'Статус (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEVSTAT_NAME', SCAPTION => 'Статус', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSEND_PERSON', SCAPTION => 'Получатель (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSEND_PERSON', SCAPTION => 'Получатель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'BYEV_S_PERSON', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NAGNLIST_RN', SCAPTION => 'Рег. номер контрагенты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSEND_DIVISION', SCAPTION => 'Подразделение (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSEND_DIVISION', SCAPTION => 'Подразделение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'BYEV_S_DIVISION', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSEND_USRGRP', SCAPTION => 'Группа пользователей (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSEND_USRGRP', SCAPTION => 'Группа пользователей', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'BYEV_S_USER_GROUP', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEVDESCR', SCAPTION => 'Описание', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCLOSED', SCAPTION => 'Аннулировано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'BYEV_CLOSED_From', SCOND_TO => 'BYEV_CLOSED_To', BFILTER => true, @@ -863,19 +863,19 @@ create or replace package body PKG_P8PANELS_CLNTTSKBRD as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLINKED_UNIT', SCAPTION => 'Учётный раздел', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLINKED_RN', SCAPTION => 'Учётный документ (Рег. номер)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'BYEV_LINKED_RN', BFILTER => true, BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSENDER', SCAPTION => 'Наименование исполнителя', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); /* Формируем блок запроса свойств документа и коллекций наименований/типов */ UTL_CLNEVENTS_DP_QUERY_BLOCK(NCOMPANY => NCOMPANY, diff --git a/db/PKG_P8PANELS_EQUIPSRV.pck b/db/PKG_P8PANELS_EQUIPSRV.pck index 6cd469f..56fd20c 100644 --- a/db/PKG_P8PANELS_EQUIPSRV.pck +++ b/db/PKG_P8PANELS_EQUIPSRV.pck @@ -404,93 +404,93 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOBJINFO', SCAPTION => 'Информация по объекту ремонта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SINFO', SCAPTION => 'Объект ремонта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SWRKTYPE', SCAPTION => 'Тип работ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SPARENT => 'SINFO', NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SWORKNAME', SCAPTION => 'Наименование работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECHOBJCODE', SCAPTION => 'Код тех. объекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECHOBJNAME', SCAPTION => 'Наименование тех. объекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SBELONG', SCAPTION => 'Принадлежность', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRODOBJ', SCAPTION => 'Производственный объект', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECHSERV', SCAPTION => 'Тех. служба', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SRESPDEP', SCAPTION => 'Отвественное подразделение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECSERVCODE', SCAPTION => 'Вид ремонта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDATEPLANBEG', SCAPTION => 'Начало работы (план)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDATEPLANEND', SCAPTION => 'Окончание работы (план)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDATEFACTBEG', SCAPTION => 'Начало работы (факт)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDATEFACTEND', SCAPTION => 'Окончание работы (факт)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECSRVKINDCODE', SCAPTION => 'Код типа работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'STECSRVKINDNAME', SCAPTION => 'Наименование типа работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); /* Очистка коллекций */ PKG_CONTVALLOC1S.PURGE(RCONTAINER => YM); @@ -533,7 +533,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => '_' || TO_CHAR(Y) || '_' || TO_CHAR(M), SCAPTION => LPAD(TO_CHAR(M), 2, '0') || ' ' || TO_CHAR(Y), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BEXPANDABLE => true, BEXPANDED => BEXPANDED); /* Подсчёт кол-ва дней в месяце */ @@ -547,7 +547,7 @@ create or replace package body PKG_P8PANELS_EQUIPSRV as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => '_' || TO_CHAR(Y) || '_' || TO_CHAR(M) || '_' || TO_CHAR(D), SCAPTION => TO_CHAR(D, '99'), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SPARENT => '_' || TO_CHAR(Y) || '_' || TO_CHAR(M)); end loop; end loop; diff --git a/db/PKG_P8PANELS_MECHREC.pck b/db/PKG_P8PANELS_MECHREC.pck index 5f72714..84057b6 100644 --- a/db/PKG_P8PANELS_MECHREC.pck +++ b/db/PKG_P8PANELS_MECHREC.pck @@ -1008,48 +1008,48 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_INFO', SCAPTION => 'Накладная', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); /* Если тип "Приход из подразделений и маршрутные листы", то необходимо включать состояние */ if (NTYPE = NTASK_TYPE_INC_DEPS_RL) then PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_STATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); end if; PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DWORK_DATE', SCAPTION => 'Дата сдачи', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_VALID_INFO', SCAPTION => 'Маршрутный лист', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOUT_DEPARTMENT', SCAPTION => 'Сдающий цех', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTORE', SCAPTION => 'Склад цеха потребителя', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_FACT', SCAPTION => 'Количество сдано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); /* Инициализируем список маршрутных листов */ @@ -1228,49 +1228,49 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRESPL_CODE', SCAPTION => 'Обозначение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRESPL_NAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROD_QUANT', SCAPTION => 'Применяемость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'Количество план', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NREST', SCAPTION => 'Остаток', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_FACT', SCAPTION => 'Скомплектовано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DRES_DATE_TO', SCAPTION => 'Зарезервировано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRESPL_NOMEN', SCAPTION => 'Номенклатура', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); /* Обходим данные */ begin @@ -1441,38 +1441,38 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SINDOC', SCAPTION => 'Партия', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTORE', SCAPTION => 'Склад', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSALE', SCAPTION => 'К продаже', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRESTFACT', SCAPTION => 'Фактический остаток', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRESERV', SCAPTION => 'Резерв', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRICEMEAS', SCAPTION => 'Единица измерения', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); /* Если номенклатура или хранилища указаны */ @@ -1634,48 +1634,48 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCPREF', SCAPTION => 'Префикс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DEXEC_DATE', SCAPTION => 'Дата запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES_PLAN_NOMEN', SCAPTION => 'Номенклатура основного материала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES_PLAN_NAME', SCAPTION => 'Наименование основного материала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT', SCAPTION => 'Количество запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'Выдать по норме', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); /* Обходим данные */ @@ -1838,42 +1838,42 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCPREF', SCAPTION => 'Префикс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DEXEC_DATE', SCAPTION => 'Дата запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT', SCAPTION => 'Количество запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DREL_DATE', SCAPTION => 'Дата выпуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NREL_QUANT', SCAPTION => 'Количество выпуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); /* Обходим данные */ @@ -2029,54 +2029,54 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCPREF', SCAPTION => 'Префикс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOCNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DEXEC_DATE', SCAPTION => 'Дата запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT', SCAPTION => 'Количество запуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DREL_DATE', SCAPTION => 'Дата выпуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NREL_QUANT', SCAPTION => 'Количество выпуска', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_FACT', SCAPTION => 'Сдано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROCENT', SCAPTION => '% готовности', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); /* Обходим данные */ @@ -2784,7 +2784,7 @@ create or replace package body PKG_P8PANELS_MECHREC as end if; /* Инициализируем диаграмму Ганта */ RG := PKG_P8PANELS_VISUAL.TGANTT_MAKE(STITLE => SPLAN_TITLE, - NZOOM => PKG_P8PANELS_VISUAL.NGANTT_ZOOM_DAY, + NZOOM => PKG_P8PANELS_VISUAL.GANTT_ZOOM_DAY(), BREAD_ONLY_DATES => BREAD_ONLY_DATES, BREAD_ONLY_PROGRESS => true); /* Инициализируем динамические атрибуты к спецификациям */ @@ -3275,42 +3275,42 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_INFO', SCAPTION => 'Документ (тип, №, дата)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT', SCAPTION => 'Количество план', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROCENT', SCAPTION => 'Готовность партии', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPRIOR_PARTY', SCAPTION => 'Приоритет партии', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPROD_ORDER', SCAPTION => 'Заказ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); /*! Пока отключен */ PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCHANGE_FACEACC', SCAPTION => 'Изменить заказ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false, BORDER => true); /* Считываем рег. номер связанной спецификации из "Производственная программа" */ @@ -3548,52 +3548,52 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOPER_NUMB', SCAPTION => 'Номер операции', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SROUTSHTSP_NAME', SCAPTION => 'Операция', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSUBDIV', SCAPTION => 'Цех, участок', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'План', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_FACT', SCAPTION => 'Факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NT_SHT_PLAN', SCAPTION => 'Трудоемкость план', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLABOUR_FACT', SCAPTION => 'Трудоемкость факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMUNIT', SCAPTION => 'ЕИ трудоемкости', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); /* Обходим данные */ begin @@ -3741,29 +3741,29 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_INFO', SCAPTION => 'Документ (тип, №, дата)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_FACT', SCAPTION => 'Количество сдано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDUE_DATE', SCAPTION => 'Дата сдачи', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => true, BORDER => true); /* Считываем рег. номер связанной спецификации из "Производственная программа" */ @@ -4013,17 +4013,17 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTATUS', SCAPTION => 'Статус', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPROD_ORDER', SCAPTION => 'Заказ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true, SHINT => 'Содержит ссылку на связанные сдаточные накладные.', @@ -4031,7 +4031,7 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES_CODE', SCAPTION => 'Обозначение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true, SHINT => 'Содержит ссылку на связанные маршрутные листы.

' || @@ -4045,33 +4045,33 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES_NAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true, NWIDTH => 200); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSUBDIV', SCAPTION => 'Цех-получатель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => true, NWIDTH => 180); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NMAIN_QUANT', SCAPTION => 'План', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NREL_FACT', SCAPTION => 'Факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFCROUTLST_QUANT', SCAPTION => 'Запущено', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, NWIDTH => 90); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, @@ -4086,12 +4086,12 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUM_PLAN', SCAPTION => 'Сумма "Количество план"', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUM_FACT', SCAPTION => 'Сумма "Количество факт"', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); /* Считываем первый и последний день месяца */ P_FIRST_LAST_DAY(DCALCDATE => sysdate, DBGNDATE => DDATE_FROM, DENDDATE => DDATE_TO); @@ -4885,58 +4885,58 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSELECT', SCAPTION => 'Выбран', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPRIOR_PARTY', SCAPTION => 'Приоритет партии', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFCROUTLST', SCAPTION => 'МЛ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES', SCAPTION => 'ДСЕ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOPER', SCAPTION => 'Операция', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'Количество', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLABOUR_PLAN', SCAPTION => 'Трудоемкость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEQCONFIG', SCAPTION => 'Станок', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEQCONFIG', SCAPTION => 'Рег. номер станка', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEQUIP_PLAN', SCAPTION => 'Рег. номер оборудования', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEG_FACT', SCAPTION => 'Дата начала факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); /* Обходим данные */ begin @@ -5109,31 +5109,31 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSELECT', SCAPTION => 'Выбран', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCODE', SCAPTION => 'Станок', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUM_LABOUR', SCAPTION => 'Загрузка в н/ч', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLOADING', SCAPTION => 'Загрузка в %', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEQUIPMENT', SCAPTION => 'Рег. номер оборудования', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); /* Считываем единицу измерения минут */ FIND_DICMUNTS_CODE(NFLAG_SMART => 0, @@ -5476,24 +5476,24 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCODE', SCAPTION => 'Мнемокод', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBGNDATE', SCAPTION => 'Действует с', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DENDDATE', SCAPTION => 'Действует по', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE()); /* Считываем первый и последний день месяца */ P_FIRST_LAST_DAY(DCALCDATE => TO_DATE(SMONTH_YEAR, 'mm.yyyy'), DBGNDATE => DDATE_FROM, DENDDATE => DDATE_TO); /* Обходим данные */ @@ -5741,13 +5741,13 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'N_' || SDATE_NAME || '_VALUE', SCAPTION => LPAD(D_DAY(DDATE), 2, '0'), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SPARENT => 'NVALUE_BY_DAYS'); /* Описываем родительскую колонку таблицы данных */ PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'N_' || SDATE_NAME || '_TYPE', SCAPTION => LPAD(D_DAY(DDATE), 2, '0'), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false, SPARENT => 'NVALUE_BY_DAYS'); /* Добавляем день в коллекцию */ @@ -5858,33 +5858,33 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSUBDIV', SCAPTION => 'Участок', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, NWIDTH => 120); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Станок', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => 240); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLOAD', SCAPTION => 'Загрузка (н/ч)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROCENT_LOAD', SCAPTION => 'Загрузка (%)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), NWIDTH => 80); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NVALUE_BY_DAYS', SCAPTION => 'Загрузка в н/ч по дням месяца', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => 'Отображает сумму трудоемкости по дням месяца.

' || 'Цвет значения отражает трудоемкость план/факт.
' || 'Если дата месяца больше или равна текущей, то отображается трудоемкость "План", иначе "Факт":
' || @@ -6153,27 +6153,27 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNUMB', SCAPTION => '% п/п', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOPERATION', SCAPTION => 'Содержание работ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXECUTOR', SCAPTION => 'Исполнитель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NREMN_LABOUR', SCAPTION => 'Остаточная трудоемкость, в н/ч', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); /* Если спецификация считалась */ if (NFCPRODPLANSP is not null) then @@ -6316,27 +6316,27 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNOMEN', SCAPTION => 'Номенклатура', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'Применяемость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPROVIDER', SCAPTION => 'Поставщик', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NDEFICIT', SCAPTION => 'Дефицит', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true); /* Если спецификация считалась */ if (NFCPRODPLANSP is not null) then @@ -7403,64 +7403,64 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSELECT', SCAPTION => 'Выбран', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), NWIDTH => 75); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFCROUTLST', SCAPTION => 'МЛ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, NWIDTH => 120); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMATRES', SCAPTION => 'ДСЕ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, NWIDTH => 120); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SOPER', SCAPTION => 'Операция', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SMANPOWER', SCAPTION => 'Профессия', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NQUANT_PLAN', SCAPTION => 'Количество', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRESOURCE_NUMB', SCAPTION => 'Численность', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLABOUR_PLAN', SCAPTION => 'Трудоемкость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFIO', SCAPTION => 'ФИО', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPERFORM_FACT', SCAPTION => 'Рег. номер исполнителя факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEG_FACT', SCAPTION => 'Дата начала факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SWORKERS_LIST', SCAPTION => 'Список исполнителей', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); /* Обходим данные */ begin @@ -7662,36 +7662,36 @@ create or replace package body PKG_P8PANELS_MECHREC as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSELECT', SCAPTION => 'Выбран', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFIO', SCAPTION => 'ФИО', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPROFESSION', SCAPTION => 'Профессия', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUM_LABOUR', SCAPTION => 'Загрузка в н/ч', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLOADING', SCAPTION => 'Загрузка в %', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NEQUIPMENT', SCAPTION => 'Рег. номер оборудования', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); /* Считываем единицу измерения минут */ FIND_DICMUNTS_CODE(NFLAG_SMART => 0, diff --git a/db/PKG_P8PANELS_PROJECTS.pck b/db/PKG_P8PANELS_PROJECTS.pck index ef88481..1c2a36f 100644 --- a/db/PKG_P8PANELS_PROJECTS.pck +++ b/db/PKG_P8PANELS_PROJECTS.pck @@ -1153,80 +1153,80 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCODE', SCAPTION => 'Код', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDMNEMO', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDNAME', BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME_USL', SCAPTION => 'Условное наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDNAME_USL', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXPECTED_RES', SCAPTION => 'Ожидаемые результаты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRJTYPE', SCAPTION => 'Тип', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDPROJECTTYPE', BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXT_CUST', SCAPTION => 'Заказчик', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDEXT_CUST', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SGOVCNTRID', SCAPTION => 'ИГК', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_OSN', SCAPTION => 'Документ-основание', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_SDOC_OSN', SCAPTION => 'Документ-основание (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_SDOC_OSN', SCAPTION => 'Документ-основание (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSUBDIV_RESP', SCAPTION => 'Подразделение-исполнитель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SRESPONSIBLE', SCAPTION => 'Ответственный исполнитель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SECON_RESP', SCAPTION => 'Ответственный экономист', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); @@ -1237,7 +1237,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'CGSTATE', BORDER => true, BFILTER => true, @@ -1245,7 +1245,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEGPLAN', SCAPTION => 'Дата начала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDPLANBEGFrom', SCOND_TO => 'EDPLANBEGTo', BORDER => true, @@ -1253,7 +1253,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DENDPLAN', SCAPTION => 'Дата окончания', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDPLANENDFrom', SCOND_TO => 'EDPLANENDTo', BORDER => true, @@ -1261,49 +1261,49 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_SUM', SCAPTION => 'Стоимость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCURNAMES', SCAPTION => 'Валюта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_IN', SCAPTION => 'Входящее финансирование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NFIN_IN', SCAPTION => 'Входящее финансирование (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NFIN_IN', SCAPTION => 'Входящее финансирование (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_OUT', SCAPTION => 'Исходящее финансирование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NFIN_OUT', SCAPTION => 'Исходящее финансирование (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NFIN_OUT', SCAPTION => 'Исходящее финансирование (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_FIN', SCAPTION => 'Фин-е (исх.)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_FIN', BORDER => true, BFILTER => true, @@ -1315,7 +1315,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_CONTR', SCAPTION => 'Контр-я', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_CONTR', BORDER => true, BFILTER => true, @@ -1327,7 +1327,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COEXEC', SCAPTION => 'Соисп-е', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_COEXEC', BORDER => true, BFILTER => true, @@ -1341,7 +1341,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_PERIOD', SCAPTION => 'Сроки', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_PERIOD', BORDER => true, BFILTER => true, @@ -1354,7 +1354,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COST', SCAPTION => 'Затраты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_COST', BORDER => true, BFILTER => true, @@ -1366,7 +1366,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_ACT', SCAPTION => 'Актир-е', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_ACT', BORDER => true, BFILTER => true, @@ -1378,7 +1378,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_READY', SCAPTION => 'Готов (%, затраты)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCOST_READYFrom', SCOND_TO => 'EDCOST_READYTo', BORDER => true, @@ -1686,32 +1686,32 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SJOB', SCAPTION => 'Работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => 300); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SRESP', SCAPTION => 'Ответственный', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DFROM', SCAPTION => 'Начало работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DTO', SCAPTION => 'Окончание работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BVISIBLE => false); for Y in EXTRACT(year from DFROM) .. EXTRACT(year from DTO) loop @@ -1724,7 +1724,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => SYEAR_COL_NAME, SCAPTION => TO_CHAR(Y), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BEXPANDABLE => true, BEXPANDED => BEXPANDED); for M in 1 .. 12 @@ -1735,7 +1735,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => SYEAR_COL_NAME || '_' || TO_CHAR(M), SCAPTION => LPAD(TO_CHAR(M), 2, '0'), - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SPARENT => SYEAR_COL_NAME); end if; end loop; @@ -1805,9 +1805,9 @@ create or replace package body PKG_P8PANELS_PROJECTS as RATTR_VALS PKG_P8PANELS_VISUAL.TCHART_DATASET_ITEM_ATTR_VALS; -- Атрибуты элемента набора данных begin /* Сформируем заголовок графика */ - RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.SCHART_TYPE_BAR, + RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.CHART_TYPE_BAR(), STITLE => 'Топ проблем', - SLGND_POS => PKG_P8PANELS_VISUAL.SCHART_LGND_POS_TOP); + SLGND_POS => PKG_P8PANELS_VISUAL.CHART_LGND_POS_TOP()); /* Сформируем набор данных */ RCH_DS := PKG_P8PANELS_VISUAL.TCHART_DATASET_MAKE(SCAPTION => 'Кол-во проектов с проблемой'); /* Строим список проблем по убыванию количества */ @@ -1920,9 +1920,9 @@ create or replace package body PKG_P8PANELS_PROJECTS as RATTR_VALS PKG_P8PANELS_VISUAL.TCHART_DATASET_ITEM_ATTR_VALS; -- Атрибуты элемента набора данных begin /* Сформируем заголовок графика */ - RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.SCHART_TYPE_PIE, + RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.CHART_TYPE_PIE(), STITLE => 'Топ заказчиков', - SLGND_POS => PKG_P8PANELS_VISUAL.SCHART_LGND_POS_RIGHT); + SLGND_POS => PKG_P8PANELS_VISUAL.CHART_LGND_POS_RIGHT()); /* Сформируем набор данных */ RCH_DS := PKG_P8PANELS_VISUAL.TCHART_DATASET_MAKE(SCAPTION => 'Стоимость проектов'); /* Обходим проекты, сгруппированные по внешним заказчикам */ @@ -1971,9 +1971,9 @@ create or replace package body PKG_P8PANELS_PROJECTS as begin NYEAR := TO_NUMBER(TO_CHAR(sysdate, 'yyyy')); /* Сформируем заголовок графика */ - RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.SCHART_TYPE_LINE, + RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.CHART_TYPE_LINE(), STITLE => 'Затраты на проекты в ' || TO_CHAR(NYEAR) || ' году', - SLGND_POS => PKG_P8PANELS_VISUAL.SCHART_LGND_POS_TOP); + SLGND_POS => PKG_P8PANELS_VISUAL.CHART_LGND_POS_TOP()); /* Сформируем набор данных */ RCH_DS := PKG_P8PANELS_VISUAL.TCHART_DATASET_MAKE(SCAPTION => 'Сумма затрат (тыс. руб.)'); /* Обходим месяцы года */ @@ -2698,31 +2698,31 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDNUMB', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDNAME', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXPECTED_RES', SCAPTION => 'Ожидаемые результаты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFACEACC', SCAPTION => 'Шифр затрат', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); @@ -2733,7 +2733,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'CGSTATE', BORDER => true, BFILTER => true, @@ -2741,7 +2741,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEGPLAN', SCAPTION => 'Дата начала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDPLANBEGFrom', SCOND_TO => 'EDPLANBEGTo', BORDER => true, @@ -2749,7 +2749,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DENDPLAN', SCAPTION => 'Дата окончания', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDPLANENDFrom', SCOND_TO => 'EDPLANENDTo', BORDER => true, @@ -2757,49 +2757,49 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_SUM', SCAPTION => 'Стоимость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCURNAMES', SCAPTION => 'Валюта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_IN', SCAPTION => 'Входящее финансирование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NFIN_IN', SCAPTION => 'Входящее финансирование (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NFIN_IN', SCAPTION => 'Входящее финансирование (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_OUT', SCAPTION => 'Исходящее финансирование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NFIN_OUT', SCAPTION => 'Исходящее финансирование (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NFIN_OUT', SCAPTION => 'Исходящее финансирование (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_FIN', SCAPTION => 'Фин-е (исх.)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_FIN', BORDER => true, BFILTER => true, @@ -2811,7 +2811,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_CONTR', SCAPTION => 'Контр-я', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_CONTR', BORDER => true, BFILTER => true, @@ -2823,7 +2823,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COEXEC', SCAPTION => 'Соисп-е', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_COEXEC', BORDER => true, BFILTER => true, @@ -2837,12 +2837,12 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NDAYS_LEFT', SCAPTION => 'Дней до окончания', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_PERIOD', SCAPTION => 'Сроки', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_PERIOD', BORDER => true, BFILTER => true, @@ -2855,47 +2855,47 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_FACT', SCAPTION => 'Сумма фактических затрат', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NCOST_FACT', SCAPTION => 'Сумма фактических затрат (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NCOST_FACT', SCAPTION => 'Сумма фактических затрат (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUMM_REALIZ', SCAPTION => 'Сумма реализации', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_NSUMM_REALIZ', SCAPTION => 'Сумма реализации (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_NSUMM_REALIZ', SCAPTION => 'Сумма реализации (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUMM_INCOME', SCAPTION => 'Сумма прибыли', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NINCOME_PRC', SCAPTION => 'Процент прибыли', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COST', SCAPTION => 'Затраты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_COST', BORDER => true, BFILTER => true, @@ -2907,7 +2907,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_ACT', SCAPTION => 'Актир-е', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_ACT', BORDER => true, BFILTER => true, @@ -2919,7 +2919,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_READY', SCAPTION => 'Готов (%, затраты)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCOST_READYFrom', SCOND_TO => 'EDCOST_READYTo', BORDER => true, @@ -2927,7 +2927,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROJECT', SCAPTION => 'Рег. номер проекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); /* Обходим данные */ begin @@ -3482,50 +3482,50 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Наименование статьи', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPLAN', SCAPTION => 'План', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_FACT', SCAPTION => 'Фактические затраты', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_DIFF', SCAPTION => 'Отклонение по затратам', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COST', SCAPTION => 'Контроль (затраты)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BFILTER => true, RCOL_VALS => RCOL_VALS); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCONTR', SCAPTION => 'Законтрактовано', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCONTR_LEFT', SCAPTION => 'Осталось законтрактовать', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_CONTR', SCAPTION => 'Контроль (контрактация)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BFILTER => true, RCOL_VALS => RCOL_VALS); /* Сформируем сведения по статям этапа проекта */ @@ -4045,46 +4045,46 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_PREF', SCAPTION => 'Префикс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDDOC_PREF', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_SDOC_PREF', SCAPTION => 'Префикс (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_SDOC_PREF', SCAPTION => 'Префикс (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_NUMB', SCAPTION => 'Номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDDOC_NUMB', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SLNK_UNIT_SDOC_NUMB', SCAPTION => 'Номер (код раздела ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLNK_DOCUMENT_SDOC_NUMB', SCAPTION => 'Номер (документ ссылки)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DDOC_DATE', SCAPTION => 'Дата', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDDOC_DATEFrom', SCOND_TO => 'EDDOC_DATETo', BORDER => true, @@ -4092,46 +4092,46 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXT_NUMBER', SCAPTION => 'Внешний номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGENT', SCAPTION => 'Соисполнитель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDAGENT', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGENT_INN', SCAPTION => 'ИНН соисполнителя', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGENT_KPP', SCAPTION => 'КПП соисполнителя', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SGOVCNTRID', SCAPTION => 'ИГК', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCSTAGE', SCAPTION => 'Этап', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDSTAGE', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCSTAGE_DESCRIPTION', SCAPTION => 'Описание этапа', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DCSTAGE_BEGIN_DATE', SCAPTION => 'Дата начала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDCSTAGE_BEGIN_DATEFrom', SCOND_TO => 'EDCSTAGE_BEGIN_DATETo', BORDER => true, @@ -4139,7 +4139,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DCSTAGE_END_DATE', SCAPTION => 'Дата окончания', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), SCOND_FROM => 'EDCSTAGE_END_DATEFrom', SCOND_TO => 'EDCSTAGE_END_DATETo', BORDER => true, @@ -4147,41 +4147,41 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSUMM', SCAPTION => 'Сумма', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCURR', SCAPTION => 'Валюта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCOST_ART', SCAPTION => 'Статья затрат', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'EDSCOST_ART', BORDER => true, BFILTER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPAY_IN', SCAPTION => 'Акцептовано счетов на оплату', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_OUT', SCAPTION => 'Оплачено счетов', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPAY_IN_REST', SCAPTION => 'Осталось оплатить счетов', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 0, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_COL_VALS_ADD(RCOL_VALS => RCOL_VALS, NVALUE => 1); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_FIN', SCAPTION => 'Фин-е (исх.)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_FIN', BORDER => false, BFILTER => true, @@ -4193,22 +4193,22 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFIN_REST', SCAPTION => 'Общий остаток к оплате по договору', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOEXEC_IN', SCAPTION => 'Получено актов/накладных', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOEXEC_REST', SCAPTION => 'Остаток к актированию/поставке', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCTRL_COEXEC', SCAPTION => 'Соисполнение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'EDCTRL_COEXEC', BORDER => false, BFILTER => true, @@ -4975,7 +4975,7 @@ create or replace package body PKG_P8PANELS_PROJECTS as end if; /* Инициализируем диаграмму Ганта */ RG := PKG_P8PANELS_VISUAL.TGANTT_MAKE(STITLE => STITLE, - NZOOM => PKG_P8PANELS_VISUAL.NGANTT_ZOOM_MONTH, + NZOOM => PKG_P8PANELS_VISUAL.GANTT_ZOOM_MONTH(), BREAD_ONLY_DATES => BREAD_ONLY_DATES, BREAD_ONLY_PROGRESS => true); /* Добавим динамические атрибуты к задачам */ @@ -5220,17 +5220,17 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер исполнения должности', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPERSON', SCAPTION => 'Сотрудник', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_PLAN_FOT', SCAPTION => 'Трудоёмкость (' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); end if; /* Обходим данные */ @@ -5428,56 +5428,56 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер трудового ресурса отчета', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRJDEPLAN', SCAPTION => 'Документ', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRJ', SCAPTION => 'Проект', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTG_JOB', SCAPTION => 'Этап-работа', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SJOB_NAME', SCAPTION => 'Наим. работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NJOB_STATE', SCAPTION => 'Сост. работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DJOB_BEG', SCAPTION => 'Начало работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DJOB_END', SCAPTION => 'Окончание работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NJOB_DUR', SCAPTION => 'Длительн. работы (' || RJB_PRMS.DURATION_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPERSON', SCAPTION => 'Сотрудник', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB', SCAPTION => 'Труд. (' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); end if; /* Обходим данные */ @@ -5732,64 +5732,64 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер работы в буфере балансировки', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPROJECT', SCAPTION => 'Рег. номер проекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NJB_PRJCTS', SCAPTION => 'Рег. номер буфера балансировки проекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPRJ', SCAPTION => 'Проект', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSTG_JOB', SCAPTION => 'Этап-работа', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SJOB_NAME', SCAPTION => 'Наим. работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NJOB_STATE', SCAPTION => 'Сост. работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DJOB_BEG', SCAPTION => 'Начало работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DJOB_END', SCAPTION => 'Окончание работы', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NJOB_DUR', SCAPTION => 'Длительн. работы (' || RJB_PRMS.DURATION_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NMP_LAB', SCAPTION => 'Труд. (' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NMP_LAB_ONE', SCAPTION => 'Труд. (в ед. длит., ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NMP_LAB_PLAN', SCAPTION => 'Труд. (план, график, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); end if; /* Обходим данные */ begin @@ -6217,56 +6217,56 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SPERIOD', SCAPTION => 'Период', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SINS_DEPARTMENT', SCAPTION => 'Подразделение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFCMANPOWER', SCAPTION => 'Ресурс', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_PLAN_FOT', SCAPTION => 'Труд. (план, ФОТ, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_FACT_RPT', SCAPTION => 'Труд. (факт, отчёт, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_DIFF_RPT_FOT', SCAPTION => 'Отклон. (факт-план, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => true, BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_PLAN_JOBS', SCAPTION => 'Труд. (план, график, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true, BFILTER => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NLAB_DIFF_JOBS_FOT', SCAPTION => 'Отклон. (график-план, ' || RJB_PRMS.LAB_MEAS_CODE || ')', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true, BFILTER => false); /* Обходим данные */ @@ -7019,59 +7019,59 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_STATUS', SCAPTION => 'Статус', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_COST_STATUS_HINT(NTYPE => 1), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCODE', SCAPTION => 'Код', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME_USL', SCAPTION => 'Условное наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SEXT_CUST', SCAPTION => 'Заказчик', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SDOC_OSN', SCAPTION => 'Договор', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_STATE_HINT(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEGPLAN', SCAPTION => 'Дата начала', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DENDPLAN', SCAPTION => 'Дата окончания', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_READY', SCAPTION => 'Готов (%, затраты)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_COST_READY_HINT(), BORDER => true); /* Обходим данные */ @@ -7201,59 +7201,59 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPRN', SCAPTION => 'Рег. номер проекта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_STATUS', SCAPTION => 'Статус', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_COST_STATUS_HINT(NTYPE => 1), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFACEACC', SCAPTION => 'Заказ/этап', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DBEGPLAN', SCAPTION => 'Начало (план)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'DENDPLAN', SCAPTION => 'Окончание (план)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_SUM', SCAPTION => 'Стоимость', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SSUBDIV_RESP', SCAPTION => 'Исполнитель', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SNAME', SCAPTION => 'Содержание', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_READY', SCAPTION => 'Готов (%, затраты)', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_COST_READY_HINT(), BORDER => true); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NSTATE', SCAPTION => 'Состояние', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_STATE_HINT(), BORDER => true); /* Обходим данные */ @@ -7357,16 +7357,16 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCODE', SCAPTION => 'Код', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SATTR', SCAPTION => 'Атрибут', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SVALUE', SCAPTION => 'Значение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); /* Обратимся к данным этапа проекта */ for REC in (select (select F.NUMB from FACEACC F where F.RN = T.FACEACC) SFACEACC, trim(T.NUMB) SNUMB, @@ -7580,43 +7580,43 @@ create or replace package body PKG_P8PANELS_PROJECTS as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NRN', SCAPTION => 'Рег. номер', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NCOST_STATUS', SCAPTION => 'Статус', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SHINT => INFO_COST_STATUS_HINT(NTYPE => 0)); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFACEACC', SCAPTION => 'Рег. номер лицевого счета затрат', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFPDARTCL', SCAPTION => 'Рег. номер статьи', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), BVISIBLE => false); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFPDARTCL', SCAPTION => 'Статья', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPLAN_SUM', SCAPTION => 'План', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NFACT_SUM', SCAPTION => 'Факт', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NPLAN_FACT_SUM', SCAPTION => 'Отклонение', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SCURNAMES', SCAPTION => 'Валюта', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); /* Сформируем список статей структуры цены */ INFO_STAGE_ARTS_GET(NPROJECTSTAGE => NPROJECTSTAGE, RINFO_STAGE_ARTS => RINFO_STAGE_ARTS); /* Обходим собранные статьи */ @@ -7662,8 +7662,8 @@ create or replace package body PKG_P8PANELS_PROJECTS as RATTR_VALS PKG_P8PANELS_VISUAL.TCHART_DATASET_ITEM_ATTR_VALS; -- Атрибуты элемента набора данных begin /* Сформируем заголовок графика */ - RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.SCHART_TYPE_PIE, - SLGND_POS => PKG_P8PANELS_VISUAL.SCHART_LGND_POS_RIGHT); + RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.CHART_TYPE_PIE(), + SLGND_POS => PKG_P8PANELS_VISUAL.CHART_LGND_POS_RIGHT()); /* Сформируем набор данных графика */ RCH_DS := PKG_P8PANELS_VISUAL.TCHART_DATASET_MAKE(SCAPTION => 'Сумма'); /* Сформируем список статей структуры цены */ diff --git a/db/PKG_P8PANELS_RRPCONFED.pck b/db/PKG_P8PANELS_RRPCONFED.pck index ba73533..9fe0a76 100644 --- a/db/PKG_P8PANELS_RRPCONFED.pck +++ b/db/PKG_P8PANELS_RRPCONFED.pck @@ -1271,7 +1271,7 @@ create or replace package body PKG_P8PANELS_RRPCONFED as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SROW_NAME', SCAPTION => 'Наименование строки', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => NCOL_WIDTH); /* Остальные колонки это графы настройки РО - строим запрос по графам показателей */ OPEN_ROWS_COLS_CUR(NRRPCONFSCTN => NRRPCONFSCTN, STABLE => 'RRPCOLUMN', NORDER => NCOL_ORDER, ICURSOR => ICURSOR); @@ -1286,7 +1286,7 @@ create or replace package body PKG_P8PANELS_RRPCONFED as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => DG_COL_NAME_BY_RRPCOLUMN(NRRPCOLUMN => NCOL_RN), SCAPTION => SCOL_NAME, - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), NWIDTH => NCOL_WIDTH); end loop; /* Освобождаем курсор */ diff --git a/db/PKG_P8PANELS_SAMPLES.pck b/db/PKG_P8PANELS_SAMPLES.pck index 6eb7d82..5122102 100644 --- a/db/PKG_P8PANELS_SAMPLES.pck +++ b/db/PKG_P8PANELS_SAMPLES.pck @@ -362,14 +362,14 @@ create or replace package body PKG_P8PANELS_SAMPLES as /* Инициализируем таблицу данных */ RDG := PKG_P8PANELS_VISUAL.TDG_MAKE(BFIXED_HEADER => true, NFIXED_COLUMNS => 2, - SPAGES_POSITION => PKG_P8PANELS_VISUAL.STABLE_PAGES_POSITION_BOTTOM, - SPAGES_ALIGN => PKG_P8PANELS_VISUAL.STABLE_PAGES_ALIGN_RIGHT, + SPAGES_POSITION => PKG_P8PANELS_VISUAL.TABLE_PAGES_POSITION_BOTTOM(), + SPAGES_ALIGN => PKG_P8PANELS_VISUAL.TABLE_PAGES_ALIGN_RIGHT(), BMORE_PAGES => case NUSE_MORE_BUTTON when 1 then true else false end); /* Описываем колонки таблицы данных */ PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGNABBR', SCAPTION => 'Мнемокод', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'AgentAbbr', BVISIBLE => true, BORDER => true, @@ -378,7 +378,7 @@ create or replace package body PKG_P8PANELS_SAMPLES as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGNINFO', SCAPTION => 'Сведения', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), BVISIBLE => true, BORDER => false, BFILTER => false, @@ -387,7 +387,7 @@ create or replace package body PKG_P8PANELS_SAMPLES as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGNNAME', SCAPTION => 'Наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), SCOND_FROM => 'AgentName', BVISIBLE => true, BORDER => true, @@ -399,7 +399,7 @@ create or replace package body PKG_P8PANELS_SAMPLES as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'NAGNTYPE', SCAPTION => 'Тип', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), SCOND_FROM => 'AgentType', BVISIBLE => true, BORDER => true, @@ -415,11 +415,11 @@ create or replace package body PKG_P8PANELS_SAMPLES as PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SFULLNAME', SCAPTION => 'Полное наименование', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, SNAME => 'SAGNIDNUMB', SCAPTION => 'ИНН', - SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR); + SDATA_TYPE => PKG_P8PANELS_VISUAL.DATA_TYPE_STR()); /* Обходим данные */ begin /* Добавляем подсказку совместимости */ @@ -548,9 +548,9 @@ create or replace package body PKG_P8PANELS_SAMPLES as RATTR_VALS PKG_P8PANELS_VISUAL.TCHART_DATASET_ITEM_ATTR_VALS; -- Атрибуты элемента набора данных begin /* Сформируем заголовок графика */ - RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.SCHART_TYPE_BAR, + RCH := PKG_P8PANELS_VISUAL.TCHART_MAKE(STYPE => PKG_P8PANELS_VISUAL.CHART_TYPE_BAR(), STITLE => 'Топ 5 контрагентов по сумме договоров', - SLGND_POS => PKG_P8PANELS_VISUAL.SCHART_LGND_POS_RIGHT); + SLGND_POS => PKG_P8PANELS_VISUAL.CHART_LGND_POS_RIGHT()); /* Сформируем набор данных */ RCH_DS := PKG_P8PANELS_VISUAL.TCHART_DATASET_MAKE(SCAPTION => 'Сумма договоров'); /* Обходим договоры, сгруппированные по контрагентам */ @@ -728,7 +728,7 @@ create or replace package body PKG_P8PANELS_SAMPLES as begin /* Инициализируем диаграмму Ганта */ RG := PKG_P8PANELS_VISUAL.TGANTT_MAKE(STITLE => 'Задачи на ' || TO_CHAR(EXTRACT(year from sysdate)) || ' год', - NZOOM => PKG_P8PANELS_VISUAL.NGANTT_ZOOM_MONTH); + NZOOM => PKG_P8PANELS_VISUAL.GANTT_ZOOM_MONTH()); /* Добавим динамические атрибуты к задачам */ PKG_P8PANELS_VISUAL.TGANTT_ADD_TASK_ATTR(RGANTT => RG, SNAME => 'type', SCAPTION => 'Тип', BVISIBLE => true); PKG_P8PANELS_VISUAL.TGANTT_ADD_TASK_ATTR(RGANTT => RG, @@ -1337,7 +1337,7 @@ create or replace package body PKG_P8PANELS_SAMPLES as SVALUE => '1000', SICON => 'downloading', NELEVATION => 2, - SVARIANT => PKG_P8PANELS_VISUAL.SINDICATOR_VARIANT_ELEVATION, + SVARIANT => PKG_P8PANELS_VISUAL.INDICATOR_VARIANT_ELEVATION(), SBACKGROUND_COLOR => '#63a1df', SCOLOR => 'black'); /* Сериализуем собранные данные */ diff --git a/db/PKG_P8PANELS_SETTINGS.pck b/db/PKG_P8PANELS_SETTINGS.pck index 4f4b1a0..a4c04a3 100644 --- a/db/PKG_P8PANELS_SETTINGS.pck +++ b/db/PKG_P8PANELS_SETTINGS.pck @@ -114,13 +114,13 @@ create or replace package body PKG_P8PANELS_SETTINGS as /* Исходим от типа данных */ case SDATA_TYPE /* Строка */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_STR then + when PKG_P8PANELS_VISUAL.DATA_TYPE_STR() then NRESULT := NDATA_TYPE_STR; /* Число */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB then + when PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB() then NRESULT := NDATA_TYPE_NUM; /* Дата */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE then + when PKG_P8PANELS_VISUAL.DATA_TYPE_DATE() then NRESULT := NDATA_TYPE_DATE; else P_EXCEPTION(0, 'Не определен тип данных параметра.'); @@ -141,13 +141,13 @@ create or replace package body PKG_P8PANELS_SETTINGS as case NDATA_TYPE /* Строка */ when NDATA_TYPE_STR then - SRESULT := PKG_P8PANELS_VISUAL.SDATA_TYPE_STR; + SRESULT := PKG_P8PANELS_VISUAL.DATA_TYPE_STR(); /* Число */ when NDATA_TYPE_NUM then - SRESULT := PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB; + SRESULT := PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(); /* Дата */ when NDATA_TYPE_DATE then - SRESULT := PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE; + SRESULT := PKG_P8PANELS_VISUAL.DATA_TYPE_DATE(); else P_EXCEPTION(0, 'Не определен тип данных параметра.'); end case; @@ -343,7 +343,7 @@ create or replace package body PKG_P8PANELS_SETTINGS as end if; /* Если тип данных не поддерживается */ if (SDATA_TYPE not in - (PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB, PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE)) then + (PKG_P8PANELS_VISUAL.DATA_TYPE_STR(), PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB(), PKG_P8PANELS_VISUAL.DATA_TYPE_DATE())) then P_EXCEPTION(0, 'Параметры типа "%s" не поддерживаются.', COALESCE(TO_CHAR(SDATA_TYPE), '<НЕ УКАЗАН>')); @@ -1018,10 +1018,10 @@ create or replace package body PKG_P8PANELS_SETTINGS as /* Исходим от типа данных */ case SDATA_TYPE /* Строка */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_STR then + when PKG_P8PANELS_VISUAL.DATA_TYPE_STR() then SVALUE_STR := SVALUE; /* Число */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB then + when PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB() then /* Конвертируем в число */ begin NVALUE_NUM := TO_NUMBER(SVALUE); @@ -1031,7 +1031,7 @@ create or replace package body PKG_P8PANELS_SETTINGS as 'Ошибка преобразования значения "' || SVALUE || '" в число.'); end; /* Дата */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE then + when PKG_P8PANELS_VISUAL.DATA_TYPE_DATE() then begin DVALUE_DATE := TO_DATE(SVALUE, 'yyyy-mm-dd'); exception @@ -1058,13 +1058,13 @@ create or replace package body PKG_P8PANELS_SETTINGS as /* Исходим от типа данных */ case SDATA_TYPE /* Строка */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_STR then + when PKG_P8PANELS_VISUAL.DATA_TYPE_STR() then SRESULT := SVALUE_STR; /* Число */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB then + when PKG_P8PANELS_VISUAL.DATA_TYPE_NUMB() then SRESULT := TO_CHAR(NVALUE_NUM); /* Дата */ - when PKG_P8PANELS_VISUAL.SDATA_TYPE_DATE then + when PKG_P8PANELS_VISUAL.DATA_TYPE_DATE() then SRESULT := TO_CHAR(DVALUE_DATE, 'yyyy-mm-dd'); else P_EXCEPTION(0, 'Не определен тип данных параметра.'); @@ -1521,4 +1521,4 @@ create or replace package body PKG_P8PANELS_SETTINGS as end PANELS_INIT; end PKG_P8PANELS_SETTINGS; -/ \ No newline at end of file +/ diff --git a/db/PKG_P8PANELS_VISUAL.pck b/db/PKG_P8PANELS_VISUAL.pck index 90e7654..e204af9 100644 --- a/db/PKG_P8PANELS_VISUAL.pck +++ b/db/PKG_P8PANELS_VISUAL.pck @@ -372,6 +372,68 @@ create or replace package PKG_P8PANELS_VISUAL as SCOLOR PKG_STD.TSTRING := null -- Цвет шрифта и иконки (HTML-код, null - использовать цвет по умолчанию для состояния) ); + /* Функции констант - типы данных */ + function DATA_TYPE_STR return varchar2; -- Тип данных "строка" + function DATA_TYPE_NUMB return varchar2; -- Тип данных "число" + function DATA_TYPE_DATE return varchar2; -- Тип данных "дата" + + /* Функции констант - направление сортировки */ + function ORDER_DIRECTION_ASC return varchar2; -- По возрастанию + function ORDER_DIRECTION_DESC return varchar2; -- По убыванию + + /* Функции констант - таблица - расположение области страниц по горизонтали */ + function TABLE_PAGES_ALIGN_LEFT return varchar2; -- Слева + function TABLE_PAGES_ALIGN_RIGHT return varchar2; -- Справа + function TABLE_PAGES_ALIGN_CENTER return varchar2; -- По середине + + /* Функции констант - таблица - расположение области страниц по вертикали */ + function TABLE_PAGES_POSITION_TOP return varchar2; -- Наверху + function TABLE_PAGES_POSITION_BOTTOM return varchar2; -- Внизу + function TABLE_PAGES_POSITION_BOTH return varchar2; -- Наверху и внизу + + /* Функции констант - диаграмма Ганта - масштаб */ + function GANTT_ZOOM_QUARTER_DAY return number; -- Четверть дня + function GANTT_ZOOM_HALF_DAY return number; -- Пол дня + function GANTT_ZOOM_DAY return number; -- День + function GANTT_ZOOM_WEEK return number; -- Неделя + function GANTT_ZOOM_MONTH return number; -- Месяц + + /* Функции констант - график - тип */ + function CHART_TYPE_BAR return varchar2; -- Столбчатая + function CHART_TYPE_LINE return varchar2; -- Линейная + function CHART_TYPE_PIE return varchar2; -- Круговая + function CHART_TYPE_DOUGHNUT return varchar2; -- Кольцевая + + /* Функции констант - график - расположение легенды */ + function CHART_LGND_POS_LEFT return varchar2; -- Слева + function CHART_LGND_POS_RIGHT return varchar2; -- Справа + function CHART_LGND_POS_TOP return varchar2; -- Наверху + function CHART_LGND_POS_BOTTOM return varchar2; -- Внизу + + /* Функции констант - циклограмма - масштаб */ + function CYCLOGRAM_ZOOM_MIN return number; -- Минимальный (0.2 от исходного) + function CYCLOGRAM_ZOOM_TINY return number; -- Мелкий (0.4 от исходного) + function CYCLOGRAM_ZOOM_SMALL return number; -- Уменьшенный (0.7 от исходного) + function CYCLOGRAM_ZOOM_DEFAULT return number; -- Исходный + function CYCLOGRAM_ZOOM_LARGE return number; -- Увеличенный (1.5 от исходного) + function CYCLOGRAM_ZOOM_HUGE return number; -- Большой (2 от исходного) + function CYCLOGRAM_ZOOM_MAX return number; -- Максимальный (2.5 от исходного) + + /* Функции констант - циклограмма - оформление */ + function CYCLOGRAM_GROUP_DEF_WIDTH return number; -- Высота заголовка группы (по умолчанию) + function CYCLOGRAM_GROUP_DEF_HEIGHT return number; -- Ширина заголовка группы (по умолчанию) + function CYCLOGRAM_LINE_HEIGHT return number; -- Высота строк циклограммы + + /* Функции констант - индикатор - состояния */ + function INDICATOR_STATE_UNDEFINED return varchar2; -- Неопределено + function INDICATOR_STATE_OK return varchar2; -- Позитивное + function INDICATOR_STATE_ERR return varchar2; -- Негативное + function INDICATOR_STATE_WARN return varchar2; -- Пограничное + + /* Функции констант - индикатор - варианты исполнения */ + function INDICATOR_VARIANT_ELEVATION return varchar2; -- Парящий + function INDICATOR_VARIANT_OUTLINED return varchar2; -- Плоский с рамкой + /* Расчет диапаона выдаваемых записей */ procedure UTL_ROWS_LIMITS_CALC ( @@ -921,6 +983,68 @@ create or replace package body PKG_P8PANELS_VISUAL as /* Константы - параметры условий отбора */ SCOND_FROM_POSTFIX constant PKG_STD.TSTRING := 'From'; -- Постфикс наименования нижней границы условия отбора SCOND_TO_POSTFIX constant PKG_STD.TSTRING := 'To'; -- Постфикс наименования верхней границы условия отбора + + /* Функции констант - типы данных */ + function DATA_TYPE_STR return varchar2 as begin return SDATA_TYPE_STR; end; -- Тип данных "строка" + function DATA_TYPE_NUMB return varchar2 as begin return SDATA_TYPE_NUMB; end; -- Тип данных "число" + function DATA_TYPE_DATE return varchar2 as begin return SDATA_TYPE_DATE; end; -- Тип данных "дата" + + /* Функции констант - направление сортировки */ + function ORDER_DIRECTION_ASC return varchar2 as begin return SORDER_DIRECTION_ASC; end; -- По возрастанию + function ORDER_DIRECTION_DESC return varchar2 as begin return SORDER_DIRECTION_DESC; end; -- По убыванию + + /* Функции констант - таблица - расположение области страниц по горизонтали */ + function TABLE_PAGES_ALIGN_LEFT return varchar2 as begin return STABLE_PAGES_ALIGN_LEFT; end; -- Слева + function TABLE_PAGES_ALIGN_RIGHT return varchar2 as begin return STABLE_PAGES_ALIGN_RIGHT; end; -- Справа + function TABLE_PAGES_ALIGN_CENTER return varchar2 as begin return STABLE_PAGES_ALIGN_CENTER; end; -- По середине + + /* Функции констант - таблица - расположение области страниц по вертикали */ + function TABLE_PAGES_POSITION_TOP return varchar2 as begin return STABLE_PAGES_POSITION_TOP; end; -- Наверху + function TABLE_PAGES_POSITION_BOTTOM return varchar2 as begin return STABLE_PAGES_POSITION_BOTTOM; end; -- Внизу + function TABLE_PAGES_POSITION_BOTH return varchar2 as begin return STABLE_PAGES_POSITION_BOTH; end; -- Наверху и внизу + + /* Функции констант - диаграмма Ганта - масштаб */ + function GANTT_ZOOM_QUARTER_DAY return number as begin return NGANTT_ZOOM_QUARTER_DAY; end; -- Четверть дня + function GANTT_ZOOM_HALF_DAY return number as begin return NGANTT_ZOOM_HALF_DAY; end; -- Пол дня + function GANTT_ZOOM_DAY return number as begin return NGANTT_ZOOM_DAY; end; -- День + function GANTT_ZOOM_WEEK return number as begin return NGANTT_ZOOM_WEEK; end; -- Неделя + function GANTT_ZOOM_MONTH return number as begin return NGANTT_ZOOM_MONTH; end; -- Месяц + + /* Функции констант - график - тип */ + function CHART_TYPE_BAR return varchar2 as begin return SCHART_TYPE_BAR; end; -- Столбчатая + function CHART_TYPE_LINE return varchar2 as begin return SCHART_TYPE_LINE; end; -- Линейная + function CHART_TYPE_PIE return varchar2 as begin return SCHART_TYPE_PIE; end; -- Круговая + function CHART_TYPE_DOUGHNUT return varchar2 as begin return SCHART_TYPE_DOUGHNUT; end; -- Кольцевая + + /* Функции констант - график - расположение легенды */ + function CHART_LGND_POS_LEFT return varchar2 as begin return SCHART_LGND_POS_LEFT; end; -- Слева + function CHART_LGND_POS_RIGHT return varchar2 as begin return SCHART_LGND_POS_RIGHT; end; -- Справа + function CHART_LGND_POS_TOP return varchar2 as begin return SCHART_LGND_POS_TOP; end; -- Наверху + function CHART_LGND_POS_BOTTOM return varchar2 as begin return SCHART_LGND_POS_BOTTOM; end; -- Внизу + + /* Функции констант - циклограмма - масштаб */ + function CYCLOGRAM_ZOOM_MIN return number as begin return NCYCLOGRAM_ZOOM_MIN; end; -- Минимальный (0.2 от исходного) + function CYCLOGRAM_ZOOM_TINY return number as begin return NCYCLOGRAM_ZOOM_TINY; end; -- Мелкий (0.4 от исходного) + function CYCLOGRAM_ZOOM_SMALL return number as begin return NCYCLOGRAM_ZOOM_SMALL; end; -- Уменьшенный (0.7 от исходного) + function CYCLOGRAM_ZOOM_DEFAULT return number as begin return NCYCLOGRAM_ZOOM_DEFAULT; end; -- Исходный + function CYCLOGRAM_ZOOM_LARGE return number as begin return NCYCLOGRAM_ZOOM_LARGE; end; -- Увеличенный (1.5 от исходного) + function CYCLOGRAM_ZOOM_HUGE return number as begin return NCYCLOGRAM_ZOOM_HUGE; end; -- Большой (2 от исходного) + function CYCLOGRAM_ZOOM_MAX return number as begin return NCYCLOGRAM_ZOOM_MAX; end; -- Максимальный (2.5 от исходного) + + /* Функции констант - циклограмма - оформление */ + function CYCLOGRAM_GROUP_DEF_WIDTH return number as begin return NCYCLOGRAM_GROUP_DEF_WIDTH; end; -- Высота заголовка группы (по умолчанию) + function CYCLOGRAM_GROUP_DEF_HEIGHT return number as begin return NCYCLOGRAM_GROUP_DEF_HEIGHT; end; -- Ширина заголовка группы (по умолчанию) + function CYCLOGRAM_LINE_HEIGHT return number as begin return NCYCLOGRAM_LINE_HEIGHT; end; -- Высота строк циклограммы + + /* Функции констант - индикатор - состояния */ + function INDICATOR_STATE_UNDEFINED return varchar2 as begin return SINDICATOR_STATE_UNDEFINED; end; -- Неопределено + function INDICATOR_STATE_OK return varchar2 as begin return SINDICATOR_STATE_OK; end; -- Позитивное + function INDICATOR_STATE_ERR return varchar2 as begin return SINDICATOR_STATE_ERR; end; -- Негативное + function INDICATOR_STATE_WARN return varchar2 as begin return SINDICATOR_STATE_WARN; end; -- Пограничное + + /* Функции констант - индикатор - варианты исполнения */ + function INDICATOR_VARIANT_ELEVATION return varchar2 as begin return SINDICATOR_VARIANT_ELEVATION; end; -- Парящий + function INDICATOR_VARIANT_OUTLINED return varchar2 as begin return SINDICATOR_VARIANT_OUTLINED; end; -- Плоский с рамкой /* Расчет диапаона выдаваемых записей */ procedure UTL_ROWS_LIMITS_CALC -- 2.34.1