From 529f285fcfd504101aba64db50ca13f696199076 Mon Sep 17 00:00:00 2001 From: Foat Saliakhov Date: Wed, 25 Dec 2024 17:45:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B2=D1=8F=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=B4=20=D0=BA=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/business-model/citizen.page | 182 ++---------------- 1 file changed, 19 insertions(+), 163 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index a951297a..e7147c50 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -4733,27 +4733,6 @@ - - abfdde4b-b67e-4e2d-9888-df89896b699c - 1f8ac5c0-22a7-4ec4-80eb-bc6615efd5e0 - Static radio button - false - true - - - 164d4970-788d-4719-b475-95d6e2db6816 - b94ef421-c1e3-4dc5-a32e-9cfbbe5d2766 - Boolean (filter) - false - true - - - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - 2f53b76e-7a40-4db5-b9d9-5de54c5c109d - Action Controller - false - true - 887d2044-9e34-46a5-852c-e9ce07b42f30 0c392198-3971-4ff2-a454-622edfefd045 @@ -8960,6 +8939,7 @@ 53311501-55a7-4d20-8c51-569fefd5bf04 Tab item_Сведения о воинском учёте true + false false @@ -9008,19 +8988,11 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 74838db8-7d4a-42a5-8aa4-deca55fe97c9 - Text - false - true - d7d54cfb-26b5-4dba-b56f-b6247183c24d 6b833525-e6de-4878-a5ab-1ea7baff4ca4 Hbox true - false false @@ -9032,7 +9004,6 @@ d7bb179a-75db-429c-b8b8-dbca4b2c19ab Vbox true - false false @@ -9080,7 +9051,6 @@ 9144b0b1-9124-4047-bac9-4abaf4412002 Hbox true - false false @@ -9145,7 +9115,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_residence"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_registration"} @@ -9226,7 +9196,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_residence"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_registration"} @@ -9264,7 +9234,6 @@ f8b083f0-0a59-4056-a9cb-46bc915af8ce Hbox true - false false @@ -9329,7 +9298,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_residence"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_deregistration"} @@ -9410,7 +9379,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_residence"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_deregistration"} @@ -9420,13 +9389,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 7522befd-2cf6-4a87-a1bc-e26a8d68ca9c - Text - false - true - 4d981f15-5535-45f7-882b-3647b251ad05 88330367-b53d-41a0-a954-59f4a614666a @@ -9434,13 +9396,6 @@ false true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 5be38161-6bb6-41fb-a3a5-e09900bf223f - Военный комиссариат - false - true - 3a00a919-c6aa-4fbf-951e-b6f2dbc24764 e1d27de7-7a7f-4f0a-adf1-525e0e93c03a @@ -9455,13 +9410,6 @@ false true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 967c0c1c-5ff8-48b5-971b-12d7fb8d5f31 - Text - false - true - 133ca212-09a6-413a-ac66-e2f6ce188f1f 5a6006e5-9ee5-4cdc-808a-7c5e788e0497 @@ -9516,13 +9464,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 80258f0c-2628-4769-8768-be3e7ce81f7e - Text - false - true - d7d54cfb-26b5-4dba-b56f-b6247183c24d f8b083f0-0a59-4056-a9cb-46bc915af8ce @@ -9537,20 +9478,6 @@ false true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c4657649-d2c0-4fff-85f5-f3d109f44748 - Text - false - true - - - 4d981f15-5535-45f7-882b-3647b251ad05 - 18ea3afc-ae60-4e11-8d6c-c06b5e485953 - Textfield (filter) - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 7522befd-2cf6-4a87-a1bc-e26a8d68ca9c @@ -9633,13 +9560,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 5be38161-6bb6-41fb-a3a5-e09900bf223f - Военный комиссариат - false - true - 3a00a919-c6aa-4fbf-951e-b6f2dbc24764 e1d27de7-7a7f-4f0a-adf1-525e0e93c03a @@ -9647,27 +9567,6 @@ false true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 967c0c1c-5ff8-48b5-971b-12d7fb8d5f31 - Text - false - true - - - 4d981f15-5535-45f7-882b-3647b251ad05 - 7fbf1d31-7554-4d55-891f-25d8eb8e9663 - код (filter) - false - true - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - d9bc6745-f16b-4ce4-a6c4-880da750000a - Text - false - true - 887d2044-9e34-46a5-852c-e9ce07b42f30 234978dc-a384-44c6-9474-e802a235b663 @@ -9688,6 +9587,7 @@ 29d9729c-eef2-4087-9b43-41accf24df6b Вертикальный контейнер true + false false @@ -9805,6 +9705,7 @@ 8ddec712-fb9b-49a4-bede-fe492a50529d Вертикальный контейнер true + false false @@ -10097,7 +9998,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"applied_fact"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"personal_data"} @@ -10387,13 +10288,6 @@ - - 84b784bf-7bec-42f5-bbb7-8a465de45019 - 1768cea2-680b-4119-9a67-e8a636e8e747 - Tab item_Системные сведения - true - true - 84b784bf-7bec-42f5-bbb7-8a465de45019 5f2f1c24-cfef-4d87-bbda-a610d60e5e59 @@ -12112,7 +12006,6 @@ 98f17219-c586-48f9-bb15-398e7351425d Tab item_Сведения об отсрочке или освобождении от призыва true - false false @@ -12365,7 +12258,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"applied_fact"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"defer_conscription"} @@ -12686,7 +12579,6 @@ 1245eafe-305a-4521-a4df-3f4e701cac70 Hbox true - false false @@ -12806,7 +12698,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_right"} @@ -12887,7 +12779,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_right"} @@ -13018,7 +12910,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_right"} @@ -13099,7 +12991,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_right"} @@ -13312,7 +13204,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"applied_fact"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"sign_deferred_release"} @@ -13598,7 +13490,6 @@ da8fb408-d73e-403a-8805-9eeaa06f6cf8 Hbox true - false false @@ -13718,7 +13609,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_decision"} @@ -13799,7 +13690,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_decision"} @@ -13930,7 +13821,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_decision"} @@ -14011,7 +13902,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"citizen_spouse","entity":"citizen_spouse","name":"death_date"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_decision"} @@ -14348,13 +14239,6 @@ - - 164d4970-788d-4719-b475-95d6e2db6816 - 14649163-3c85-461a-8bfb-6e312a6a0f44 - Boolean (filter) - false - true - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e b25253c7-4ed5-4111-96d1-d90eceae9691 @@ -21076,13 +20960,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - dde5f1b1-0075-4b82-be97-a78b4abd8b85 - Text Сведения о дипломе/аттестате - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 58542e60-d9c5-4fbe-aaef-b9b1994454b4 @@ -21987,13 +21864,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - d4706d44-dcec-41e3-9472-f3c94908d08c - Text Сведения о дипломе/аттестате - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 5cb284fc-1ccb-4569-920f-407838042b7b @@ -26368,7 +26238,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"applied_fact"} + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"sign_deferred_release"} @@ -32790,13 +32660,6 @@ - - 164d4970-788d-4719-b475-95d6e2db6816 - 3945b2d6-104e-4fa8-ac26-53b2d57ec569 - Boolean (filter) - false - true - 4d981f15-5535-45f7-882b-3647b251ad05 31721b72-b631-4d20-a6f4-ba2b1edfcddd @@ -34769,13 +34632,6 @@ - - 164d4970-788d-4719-b475-95d6e2db6816 - 120a41c8-e637-4333-811b-0f5d4d04d43f - Boolean (filter) - false - true - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e 0497ce7e-bebf-4a14-a5e6-e5c5ca704748