From af8bf477d36ee724165839e6d602d2dbd058fa07 Mon Sep 17 00:00:00 2001 From: Foat Saliakhov Date: Wed, 15 Jan 2025 10:06:55 +0300 Subject: [PATCH 1/3] fix changeset --- .../main/resources/config/v_1.0/20250114-ERVU-db_changes.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/config/v_1.0/20250114-ERVU-db_changes.xml b/backend/src/main/resources/config/v_1.0/20250114-ERVU-db_changes.xml index 869be27..b6585de 100644 --- a/backend/src/main/resources/config/v_1.0/20250114-ERVU-db_changes.xml +++ b/backend/src/main/resources/config/v_1.0/20250114-ERVU-db_changes.xml @@ -17,7 +17,8 @@ info_date date NOT NULL, count_arrived_death_reason int8 DEFAULT 0 NOT NULL, count_arrived_age_limit int8 DEFAULT 0 NOT NULL, - CONSTRAINT decisions_signing_pkey PRIMARY KEY (decisions_signing_id) + CONSTRAINT decisions_signing_pkey PRIMARY KEY (decisions_signing_id), + CONSTRAINT fk_decisions_signing_recruitment_id FOREIGN KEY (recruitment_id) REFERENCES metrics.recruitment(id) ); CREATE INDEX IF NOT EXISTS idx_decisions_signing_date ON deregistration.decisions_signing USING btree (info_date); CREATE INDEX IF NOT EXISTS idx_decisions_signing_recr ON deregistration.decisions_signing USING btree (recruitment_id); @@ -29,8 +30,6 @@ ALTER TABLE IF EXISTS deregistration.decisions_signing OWNER TO ervu_business_metrics; - ALTER TABLE IF EXISTS deregistration.decisions_signing ADD CONSTRAINT fk_decisions_signing_recruitment_id FOREIGN KEY (recruitment_id) REFERENCES metrics.recruitment(id); - CREATE OR REPLACE VIEW deregistration.view_decisions_signing AS SELECT decisions_signing.decisions_signing_id, decisions_signing.count_arrived_death_reason + decisions_signing.count_arrived_age_limit AS count_arrived_all, From 190095f046880a41607b5de3876259766022f242 Mon Sep 17 00:00:00 2001 From: Foat Saliakhov Date: Wed, 15 Jan 2025 16:59:57 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E?= =?UTF-8?q?=D1=89=D0=B8=D0=B9=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D0=BE=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register_subpoenas.page | 165 +++++++++++++++++- 1 file changed, 163 insertions(+), 2 deletions(-) diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page b/resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page index 635ee9c..ec72889 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page @@ -75,10 +75,140 @@ + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 77ed2116-8a9e-4480-93d7-43ccf7b7aa7a + DropdownTreeView 2 + false + false + + + + collapseLevel + +1.0 + + + + maxHeight + +null + + + + style + + + + height + + null + + + + maxHeight + + null + + + + + + + + + + + treeItemService + + + + businessIdColumn + + {"schema":"metrics","table":"region","entity":"region","name":"region_id"} + + + + idColumn + + {"schema":"metrics","table":"region","entity":"region","name":"region_id"} + + + + labelColumn + + {"schema":"metrics","table":"region","entity":"region","name":"subject_name"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"region":{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + parentIdColumn + + {"schema":"metrics","table":"region","entity":"region","name":"region_id"} + + + + sortColumn + + {"schema":"metrics","table":"region","entity":"region","name":"region_id"} + + + + sortOrder + + "ASC" + + + + + + + + + + FilterComponent + component.filter + + + + + DropdownTreeViewFilterComponent + ervu_business_metrics.component.filter + + true + true + + + isBusinessId + +true + + + + operation + +"EQUAL" + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 7085eb05-5251-41dd-8484-8d24ee839f76 - Выпадающий список РФ + Выпадающий список РФ(удалить) false false @@ -101,6 +231,37 @@ null + + scrollGravity + +null + + + + style + + + + height + + "400" + + + + maxHeight + + null + + + + + + + visible + +false + + @@ -3470,7 +3631,6 @@ 18ecb7c6-2148-4eb0-a18c-97af5e73cac7 ГК Второй ряд true - false false @@ -8472,6 +8632,7 @@ d1069ca8-24fc-4368-9465-cc0a70928fae ГК Третий ряд true + false false From 9bcd9792052e8b93ef43b7907896a2b260cf9508 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 16 Jan 2025 09:54:17 +0300 Subject: [PATCH 3/3] panel-btn-fixed-right --- frontend/src/resources/css/components-business-metrics.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-business-metrics.css b/frontend/src/resources/css/components-business-metrics.css index 3ed505b..af3bdec 100644 --- a/frontend/src/resources/css/components-business-metrics.css +++ b/frontend/src/resources/css/components-business-metrics.css @@ -239,7 +239,7 @@ .webbpm.ervu_business_metrics .group-section + .group-section { margin-top: var(--indent-mini); } -.webbpm.ervu_business_metrics .block-panel .panel-btn-fixed .btn { +.webbpm.ervu_business_metrics .block-panel .panel-btn-fixed-right .btn { padding-right: 64px; } @@ -391,8 +391,6 @@ width: min(11vw, 13.75rem) !important; /*220px*/ height: min(11vw, 13.75rem) !important; /*220px*/ } -.webbpm.ervu_business_metrics .graph-donut-large .chart-content { -} .webbpm.ervu_business_metrics [class*="graph-legend"] * { margin-bottom: 0;