From 25ec36a4d6ae354cd390aca25ad71256f5f74d9e Mon Sep 17 00:00:00 2001 From: Foat Saliakhov Date: Mon, 31 Mar 2025 15:34:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initial_registration.page | 16 +++++++--------- .../register_subpoenas.page | 10 +++++----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page index 2d759a7..14b5cab 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page @@ -2539,6 +2539,7 @@ 201e300c-2785-4181-ac47-a98d0e0de4ce ВК ГИР ВУ true + false false @@ -2563,6 +2564,7 @@ b3543f98-8317-42b5-93bb-1737fbb2d3ee ГК Первый ряд true + false false @@ -2587,6 +2589,7 @@ 205f17a7-729b-412e-b9ee-ac65bc6543bc Vbox_50% true +false false @@ -4632,7 +4635,6 @@ 1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37 ГК Второй ряд true - false false @@ -8368,7 +8370,6 @@ f9b72a92-ac14-47c0-8a18-0a392b96bebd Вертикальный контейнер true -false false @@ -10614,7 +10615,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizens_next_year_age":{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"citizens_next_year_age","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizens_next_year_age":{"tableName":"citizens_next_year_age","schemaName":"init_registration_info","x":330.0,"y":139.0,"alias":"citizens_next_year_age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_age"},"operation":"EQUAL","typeCode":"CONST","values":["\"17_YEARS\""]},{"column":{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"info_source"},"operation":"EQUAL","typeCode":"CONST","values":["\"GIR_VU\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":112.0,"y":259.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"citizens_next_year_age","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"init_registration_info","table":"citizens_next_year_age","entity":"citizens_next_year_age","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} @@ -22628,6 +22629,7 @@ a8bf2e61-57cb-4654-9618-ab51c9a99e7b Вертикальный контейнер true +false false @@ -22655,7 +22657,6 @@ f9c0232a-5785-4fde-9a6d-dfbdd909073e Vbox_50% true - false false @@ -27621,7 +27622,6 @@ 99429bab-99a2-45cd-aea3-841287e1bd9d ГК третий ряд true - false false @@ -31356,7 +31356,6 @@ 649e818d-2709-4af9-8816-a7a28007b060 Vbox_50% true -false false @@ -31708,7 +31707,6 @@ 8ce33491-362c-4be8-b964-2abec01f4e30 Постановка в 18 лет и старше true - false false @@ -32686,6 +32684,7 @@ 160f5fc4-2041-4779-9bad-e5b9bf61ad86 ВК ГИР ВУ true + false false @@ -32721,6 +32720,7 @@ a55d6b3f-4191-4aa3-be54-99bd86215c5c Первоначальная постановка на учет по данным ГИР ВУ true +false false @@ -42278,7 +42278,6 @@ 62e2055e-ccf0-4878-9420-5aa4c2cd0a0c ВК ЕПГУ true - false false @@ -42299,7 +42298,6 @@ be02cae7-d22c-4170-8c2c-40ca696b1a3a ГК Первый ряд true - false false 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 a9db74c..949bca2 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 @@ -1573,6 +1573,7 @@ b611af10-ff6b-4bbe-a0b2-738824d7c80c ГК Первый ряд true + false false @@ -1861,7 +1862,6 @@ false - false chartService @@ -1921,7 +1921,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"all_summonses":{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_all_summonses":{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null,{"refOnEntityName":"all_summonses","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[{"refOnEntityName":"view_all_summonses","refToEntityName":"all_summonses","refToColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"all_summonses_id"}],"refOnColumns":[{"schema":"summonses_list","table":"view_all_summonses","entity":"view_all_summonses","name":"all_summonses_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"all_summonses":{"tableName":"all_summonses","schemaName":"summonses_list","x":323.0,"y":116.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":114.0,"y":159.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_all_summonses":{"tableName":"view_all_summonses","schemaName":"summonses_list","x":541.0,"y":123.0,"alias":"view_all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null,{"refOnEntityName":"all_summonses","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[{"refOnEntityName":"view_all_summonses","refToEntityName":"all_summonses","refToColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"all_summonses_id"}],"refOnColumns":[{"schema":"summonses_list","table":"view_all_summonses","entity":"view_all_summonses","name":"all_summonses_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null]],"mainNodeIndex":0} @@ -2116,7 +2116,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"all_summonses":{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"all_summonses","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"all_summonses":{"tableName":"all_summonses","schemaName":"summonses_list","x":392.0,"y":120.0,"alias":"all_summonses","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":161.0,"y":114.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"all_summonses","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"summonses_list","table":"all_summonses","entity":"all_summonses","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} @@ -2133,7 +2133,6 @@ - false @@ -3418,6 +3417,7 @@ 9f9c5c62-0ba7-447e-8d37-3eafef87fca1 ГК Выпадающий список true + false false @@ -3597,7 +3597,6 @@ 5339daad-eeab-4b2a-9c0a-f8e79ff3da61 ВК Количество сформированных повесток true - false false @@ -6611,6 +6610,7 @@ 26143289-a790-4678-9410-680cd152dafe ВК Явка в военный комиссариат true + false false