diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page b/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page index ddeae96..fd1a71b 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page @@ -2526,7 +2526,6 @@ 40008c21-16ff-4414-992c-130de19bcc97 ВК ГИР ВУ true - false false @@ -6967,7 +6966,6 @@ 0dcbc26f-c5a3-4a88-880f-9823106ae254 ГК Второй ряд true - false false @@ -6992,7 +6990,6 @@ 1e265fa5-b466-4d1f-b666-6bea4eba4dda ВК Отправка уведомлений в ЛК гражданина на ЕПГУ true - false false @@ -8576,7 +8573,7 @@ defaultValueColumn - {"schema":"registration_change_address","table":"view_info_sent_to_lk_epgu","entity":"view_info_sent_to_lk_epgu","name":"percent_exceeded_delivered"} + {"schema":"registration_change_address","table":"view_info_sent_to_lk_epgu","entity":"view_info_sent_to_lk_epgu","name":"percent_delivered"} @@ -8598,7 +8595,7 @@ valueByEventColumn - {"schema":"registration_change_address","table":"view_info_sent_to_lk_epgu","entity":"view_info_sent_to_lk_epgu","name":"percent_exceeded_delivered"} + {"schema":"registration_change_address","table":"view_info_sent_to_lk_epgu","entity":"view_info_sent_to_lk_epgu","name":"percent_delivered"} @@ -10619,6 +10616,7 @@ 5474580e-080e-4895-9772-18cf6fdbf1ed ВК Временные меры, введенные в текущем ВК true + false false @@ -24849,6 +24847,7 @@ 5225591e-a5bb-4473-9fa9-d11dd162494a ВК Личное посещение ВК true + false false diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page b/resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page index 4c3251a..3f55091 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page @@ -3070,7 +3070,6 @@ 02aafe66-22b4-4921-a9d7-bb665dfdb4d0 ВК ГИР ВУ true - false false @@ -6073,7 +6072,6 @@ 1e5b6f27-261c-46ae-a6d9-e28b5e588328 ГК Второй ряд true - false false @@ -6098,7 +6096,6 @@ 8e757e8b-8564-4662-bbaa-e40764370ce6 ВК Отправка уведомлений в ЛК гражданина на ЕПГУ true - false false @@ -6336,7 +6333,6 @@ ba90ef5b-5e45-49fc-bfb1-51dbc8e938dd ГК График и показатели true -false false @@ -7292,12 +7288,49 @@ + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 69a748ca-ad20-4183-b798-362b786dcab9 + * кроме причины смерти + false + false + + + + initialValue + + "* кроме причины смерти" + + + + tooltip + + null + + + + + + + + + false + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 69a748ca-ad20-4183-b798-362b786dcab9 + * кроме причины смерти + false + true d7d54cfb-26b5-4dba-b56f-b6247183c24d 9b57a03e-f427-448f-a4d9-6fbd13dcf8f0 Горизонтальный контейнер true + false false @@ -7322,6 +7355,7 @@ 10be6890-75d9-48bc-be5b-830bc672c3f7 Vbox% true + false false @@ -8216,6 +8250,7 @@ 2d4e22fe-8512-4528-8852-77e499a7e79a VboxValue true + false false @@ -9056,6 +9091,7 @@ d813ff0e-68c3-44cc-97f2-2f50d5a43dfd ВК Показатели true + false false @@ -9205,7 +9241,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 3a7a2fee-9f31-44c1-8299-dde55900e6fe - Отправлено + Отправлено * false false @@ -9213,7 +9249,7 @@ initialValue - "Отправлено" + "Отправлено *" @@ -9225,7 +9261,7 @@ tooltip - "Отправлено" + "Отправлено *" @@ -9335,7 +9371,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 60598ba1-f6ef-48e1-9732-c0dba8226226 - Доставлено + Доставлено * false false false @@ -9344,7 +9380,7 @@ initialValue - "Доставлено" + "Доставлено *" @@ -9356,7 +9392,7 @@ tooltip - "Доставлено" + "Доставлено *" @@ -9759,7 +9795,6 @@ 9b9f2335-d26e-48af-b079-9d49e3b7f1f6 ВК Решения на подписании true -false false @@ -9985,6 +10020,7 @@ 5ddc2fed-b799-4c51-a0e6-9c7bc5db91e2 ВК График true + false false @@ -10123,7 +10159,7 @@ aggregationColumn - {"schema":"deregistration","table":"data_from_gir_vu","entity":"data_from_gir_vu","name":"count_arrived_death_reason"} + {"schema":"deregistration","table":"decisions_signing","entity":"decisions_signing","name":"count_arrived_death_reason"} @@ -10153,7 +10189,7 @@ aggregationColumn - {"schema":"deregistration","table":"data_from_gir_vu","entity":"data_from_gir_vu","name":"count_arrived_age_limit"} + {"schema":"deregistration","table":"decisions_signing","entity":"decisions_signing","name":"count_arrived_age_limit"} @@ -10210,7 +10246,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"data_from_gir_vu","schemaName":"deregistration","x":440.0,"y":185.0,"alias":"data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"data_from_gir_vu","schemaName":"deregistration","x":440.0,"y":185.0,"alias":"data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"data_from_gir_vu":{"tableName":"data_from_gir_vu","schemaName":"deregistration","x":440.0,"y":185.0,"alias":"data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"deregistration","table":"data_from_gir_vu","entity":"data_from_gir_vu","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":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"decisions_signing","schemaName":"deregistration","x":430.0,"y":127.0,"alias":"decisions_signing","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"decisions_signing","schemaName":"deregistration","x":430.0,"y":127.0,"alias":"decisions_signing","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"decisions_signing":{"tableName":"decisions_signing","schemaName":"deregistration","x":430.0,"y":127.0,"alias":"decisions_signing","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":157.0,"y":176.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"decisions_signing","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"deregistration","table":"decisions_signing","entity":"decisions_signing","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} @@ -10227,7 +10263,6 @@ - false @@ -10408,6 +10443,7 @@ e4dd1e7e-2169-4d53-88f9-cf7584a8b346 Вертикальный контейнер true + false false @@ -11242,6 +11278,7 @@ 7a6667cb-c585-4de9-a62f-54a77b1246c2 ГК Сформированные решения о снятии с ВУ true +false false @@ -18053,6 +18090,7 @@ cb6ee7de-a747-4458-bc41-acff47b8c61b ГК Второй ряд true + false false @@ -20306,7 +20344,6 @@ eebb534d-6231-41ea-9af4-d7d6cd3a4e7b ГК Третий ряд true - false false @@ -20331,7 +20368,6 @@ d8eef8cb-23b0-49c3-9730-427fd37d4394 ВК Отправка уведомлений в ЛК гражданина на ЕПГУ true - false false @@ -20569,7 +20605,6 @@ b9ab6f80-84b2-4bf8-8d87-0b38612a3dc4 ГК График и показатели true -false false @@ -20581,7 +20616,6 @@ 5ee974e4-eb78-4ca0-aacb-5e2a57e6605c ВК График true - false false @@ -21526,6 +21560,35 @@ + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 34ac4a23-beda-4e61-b58d-5ece03d430ee + * кроме причины смерти + false + false + + + + initialValue + + "* кроме причины смерти" + + + + tooltip + + null + + + + + + + + + false + + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -21556,6 +21619,7 @@ 61ce6714-6882-458a-acf6-fd28612392ee Vbox% true + false false @@ -22450,6 +22514,7 @@ c7abaf46-a1ea-421f-b171-fbf417e1a4f0 VboxValue true + false false @@ -23439,7 +23504,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 95a72868-34e8-4f3e-b619-d4f5d28be8b1 - Отправлено + Отправлено * false false @@ -23447,7 +23512,7 @@ initialValue - "Отправлено" + "Отправлено *" @@ -23459,7 +23524,7 @@ tooltip - "Отправлено" + "Отправлено *" @@ -23569,7 +23634,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 77b3acd1-dd11-43cc-994d-489a2e72aa5c - Доставлено + Доставлено * false false false @@ -23578,7 +23643,7 @@ initialValue - "Доставлено" + "Доставлено *" @@ -23590,7 +23655,7 @@ tooltip - "Доставлено" + "Доставлено *" @@ -23966,6 +24031,7 @@ afcd0405-4bfa-44f9-99c7-90b7b5956b8e Вертикальный контейнер true + false false