From 05704228aa37881b1415bf7880e52d71fadc7074 Mon Sep 17 00:00:00 2001
From: Foat Saliakhov <f.saliakhov@micord.ru>
Date: Sat, 4 Oct 2025 01:28:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=B4=D0=B2=D1=8F?=
 =?UTF-8?q?=D0=B7=D0=BA=D1=83=20=D0=BA=20=D0=B1=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business-model/citizen_all_filters.page   | 347 +++++++++++++++---
 1 file changed, 300 insertions(+), 47 deletions(-)

diff --git a/resources/src/main/resources/business-model/citizen_all_filters.page b/resources/src/main/resources/business-model/citizen_all_filters.page
index f0c05086..9aab307a 100644
--- a/resources/src/main/resources/business-model/citizen_all_filters.page
+++ b/resources/src/main/resources/business-model/citizen_all_filters.page
@@ -9089,6 +9089,7 @@
         <componentRootId>d1e7ded3-e521-4a1a-b877-fa43e6dff538</componentRootId>
         <name>Vbox_Личные сведения </name>
         <container>true</container>
+        <expanded>false</expanded>
         <childrenReordered>false</childrenReordered>
         <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
             <properties>
@@ -13813,6 +13814,7 @@
             <componentRootId>366a4c17-5e9a-4c83-9143-92be468a19ee</componentRootId>
             <name>Hbox</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
             <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -13877,10 +13879,41 @@
                 <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
                 <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
                 <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
+                <children id="e86a6897-44d9-4d9c-aae7-71c4f08a9a2f">
+                    <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+                    <componentRootId>e86a6897-44d9-4d9c-aae7-71c4f08a9a2f</componentRootId>
+                    <name>Text</name>
+                    <container>false</container>
+                    <childrenReordered>false</childrenReordered>
+                    <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                        <properties>
+                            <entry>
+<key>cssClasses</key>
+<value>
+    <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="true"/>
+    <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+    <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+</value>
+                            </entry>
+                            <entry>
+<key>initialValue</key>
+<value>
+    <simple>"Страна"</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+                    <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+                    <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+                    <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                        <enabled>false</enabled>
+                    </scripts>
+                </children>
                 <children id="7e574688-a6b3-4020-975c-9c6f7b315023">
                     <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
                     <componentRootId>7e574688-a6b3-4020-975c-9c6f7b315023</componentRootId>
-                    <name>Место рождения</name>
+                    <name>Страна</name>
                     <container>false</container>
                     <childrenReordered>false</childrenReordered>
                     <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
@@ -13928,27 +13961,246 @@
                     <scripts id="2e66508a-de36-4816-b32c-18f8c7c39830"/>
                     <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
                 </children>
-                <children id="e86a6897-44d9-4d9c-aae7-71c4f08a9a2f">
-                    <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
-                    <componentRootId>e86a6897-44d9-4d9c-aae7-71c4f08a9a2f</componentRootId>
-                    <name>Text</name>
-                    <container>false</container>
-                    <removed>true</removed>
-                </children>
             </children>
             <children id="3fd017d9-0324-4c73-a6c5-b5a235c9ab83">
                 <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
                 <componentRootId>3fd017d9-0324-4c73-a6c5-b5a235c9ab83</componentRootId>
                 <name>Vbox</name>
                 <container>true</container>
-                <removed>true</removed>
+                <childrenReordered>false</childrenReordered>
+                <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
+                    <properties>
+                        <entry>
+                            <key>cssClasses</key>
+                            <value>
+<item id="935630b1-9869-424e-b1a7-3a82d2adab53" removed="false">
+    <value>
+        <simple>"search-date"</simple>
+    </value>
+</item>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>style</key>
+                            <value>
+<complex>
+    <entry>
+        <key>width</key>
+        <value>
+            <simple>"33%"</simple>
+        </value>
+    </entry>
+</complex>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
+                <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
+                <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
+                <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
+                <children id="256ca18e-cb52-48ab-8324-1a0beb69a19a">
+                    <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+                    <componentRootId>256ca18e-cb52-48ab-8324-1a0beb69a19a</componentRootId>
+                    <name>Text</name>
+                    <container>false</container>
+                    <childrenReordered>false</childrenReordered>
+                    <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                        <properties>
+                            <entry>
+<key>cssClasses</key>
+<value>
+    <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="true"/>
+    <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+    <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+</value>
+                            </entry>
+                            <entry>
+<key>initialValue</key>
+<value>
+    <simple>"Регион"</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+                    <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+                    <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+                    <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                        <enabled>false</enabled>
+                    </scripts>
+                </children>
+                <children id="c81ec3e4-0fe4-43d4-b8c2-1594285220b6">
+                    <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+                    <componentRootId>c81ec3e4-0fe4-43d4-b8c2-1594285220b6</componentRootId>
+                    <name>Регион</name>
+                    <container>false</container>
+                    <childrenReordered>false</childrenReordered>
+                    <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                        <properties>
+                            <entry>
+<key>cssClasses</key>
+<value>
+    <item id="9fcf15f5-6b79-459d-9e92-6afb724b5e3e" removed="false">
+        <value>
+            <simple>"free-label"</simple>
+        </value>
+    </item>
+</value>
+                            </entry>
+                            <entry>
+<key>label</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="734c5516-d349-4b42-a92a-4469760104fe">
+                        <properties>
+                            <entry>
+<key>operation</key>
+<value>
+    <simple>"CONTAINS"</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="f893a042-cd3d-4d4a-89d1-95a9399a772b">
+                        <properties>
+                            <entry>
+<key>columnForFilter</key>
+<value>
+    <simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_place"}</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="5ba072f6-3017-4f32-9a6a-1ca5e690e1dd"/>
+                    <scripts id="ef53357a-6f68-4479-9a05-d37cfb44b6ba"/>
+                    <scripts id="2e66508a-de36-4816-b32c-18f8c7c39830"/>
+                    <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
+                </children>
             </children>
             <children id="454013b7-036c-4d4c-8ab9-ba3a40f57bdd">
                 <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
                 <componentRootId>454013b7-036c-4d4c-8ab9-ba3a40f57bdd</componentRootId>
                 <name>Vbox</name>
                 <container>true</container>
-                <removed>true</removed>
+                <childrenReordered>false</childrenReordered>
+                <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
+                    <properties>
+                        <entry>
+                            <key>cssClasses</key>
+                            <value>
+<item id="29635e0e-d38a-4c9d-82b3-3b08c14be666" removed="false">
+    <value>
+        <simple>"search-date"</simple>
+    </value>
+</item>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>style</key>
+                            <value>
+<complex>
+    <entry>
+        <key>width</key>
+        <value>
+            <simple>"33%"</simple>
+        </value>
+    </entry>
+</complex>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
+                <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
+                <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
+                <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
+                <children id="3e0007dd-f8db-44a5-9837-e581f235db5b">
+                    <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+                    <componentRootId>3e0007dd-f8db-44a5-9837-e581f235db5b</componentRootId>
+                    <name>Text</name>
+                    <container>false</container>
+                    <childrenReordered>false</childrenReordered>
+                    <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                        <properties>
+                            <entry>
+<key>cssClasses</key>
+<value>
+    <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="true"/>
+    <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+    <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+</value>
+                            </entry>
+                            <entry>
+<key>initialValue</key>
+<value>
+    <simple>"Населённый пункт"</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+                    <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+                    <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+                    <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                        <enabled>false</enabled>
+                    </scripts>
+                </children>
+                <children id="c0d7a197-b4ad-4def-8c5d-9e139d601c91">
+                    <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+                    <componentRootId>c0d7a197-b4ad-4def-8c5d-9e139d601c91</componentRootId>
+                    <name>Населённый пункт</name>
+                    <container>false</container>
+                    <childrenReordered>false</childrenReordered>
+                    <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                        <properties>
+                            <entry>
+<key>cssClasses</key>
+<value>
+    <item id="71944150-7578-4efe-9380-13e1918226ce" removed="false">
+        <value>
+            <simple>"free-label"</simple>
+        </value>
+    </item>
+</value>
+                            </entry>
+                            <entry>
+<key>label</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="734c5516-d349-4b42-a92a-4469760104fe">
+                        <properties>
+                            <entry>
+<key>operation</key>
+<value>
+    <simple>"CONTAINS"</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="f893a042-cd3d-4d4a-89d1-95a9399a772b">
+                        <properties>
+                            <entry>
+<key>columnForFilter</key>
+<value>
+    <simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_place"}</simple>
+</value>
+                            </entry>
+                        </properties>
+                    </scripts>
+                    <scripts id="5ba072f6-3017-4f32-9a6a-1ca5e690e1dd"/>
+                    <scripts id="ef53357a-6f68-4479-9a05-d37cfb44b6ba"/>
+                    <scripts id="2e66508a-de36-4816-b32c-18f8c7c39830"/>
+                    <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
+                </children>
             </children>
             <children id="e86a6897-44d9-4d9c-aae7-71c4f08a9a2f">
                 <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
@@ -33494,42 +33746,6 @@
         <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
         <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
         <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
-        <children id="0fa82039-42b0-4ed5-8929-95697d2df5ee">
-            <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
-            <componentRootId>0fa82039-42b0-4ed5-8929-95697d2df5ee</componentRootId>
-            <name>Text Сведения об образовании</name>
-            <container>false</container>
-            <expanded>false</expanded>
-            <childrenReordered>false</childrenReordered>
-            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
-                <properties>
-                    <entry>
-                        <key>cssClasses</key>
-                        <value>
-                            <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="false">
-<value>
-    <simple>"title"</simple>
-</value>
-                            </item>
-                            <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
-                            <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>initialValue</key>
-                        <value>
-                            <simple>"Сведения об образовании"</simple>
-                        </value>
-                    </entry>
-                </properties>
-            </scripts>
-            <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
-            <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
-            <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
-            <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
-                <enabled>false</enabled>
-            </scripts>
-        </children>
         <children id="8e73d6c9-6dbe-4a9e-9f53-b23726544941">
             <prototypeId>abfdde4b-b67e-4e2d-9888-df89896b699c</prototypeId>
             <componentRootId>8e73d6c9-6dbe-4a9e-9f53-b23726544941</componentRootId>
@@ -34549,7 +34765,7 @@
                     <entry>
                         <key>columnForFilter</key>
                         <value>
-                            <simple>{"schema":"ervu_dashboard","table":"citizen_deferment_right","entity":"citizen_deferment_right","name":"code"}</simple>
+                            <simple>{"schema":"ervu_dashboard","table":"citizen_education","entity":"citizen_education","name":"leave_reason_code"}</simple>
                         </value>
                     </entry>
                 </properties>
@@ -36896,6 +37112,42 @@
                 <removed>true</removed>
             </children>
         </children>
+        <children id="0fa82039-42b0-4ed5-8929-95697d2df5ee">
+            <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+            <componentRootId>0fa82039-42b0-4ed5-8929-95697d2df5ee</componentRootId>
+            <name>Text Сведения об образовании</name>
+            <container>false</container>
+            <expanded>false</expanded>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                <properties>
+                    <entry>
+                        <key>cssClasses</key>
+                        <value>
+                            <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="false">
+<value>
+    <simple>"title"</simple>
+</value>
+                            </item>
+                            <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+                            <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>initialValue</key>
+                        <value>
+                            <simple>"Сведения об образовании"</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+            <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+            <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+            <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                <enabled>false</enabled>
+            </scripts>
+        </children>
         <children id="7d16e572-897e-4001-8b05-623dc3d468e2">
             <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
             <componentRootId>7d16e572-897e-4001-8b05-623dc3d468e2</componentRootId>
@@ -57098,6 +57350,7 @@
     <componentRootId>f0e23de9-c1a2-4caf-9476-6191d5b1961b</componentRootId>
     <name>Tab item_Сведения о пересечении границы</name>
     <container>true</container>
+    <expanded>false</expanded>
     <childrenReordered>false</childrenReordered>
     <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
         <properties>