From 0be53c59bf7d685e16d02706afdded741cd44843 Mon Sep 17 00:00:00 2001
From: Foat Saliakhov <f.saliakhov@micord.ru>
Date: Mon, 5 May 2025 15:46:43 +0300
Subject: [PATCH] fix

---
 .../ervu-business-metrics/administration.page | 184 ++++++++++++------
 1 file changed, 124 insertions(+), 60 deletions(-)

diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/administration.page b/resources/src/main/resources/business-model/ervu-business-metrics/administration.page
index 5a87f00..66768ad 100644
--- a/resources/src/main/resources/business-model/ervu-business-metrics/administration.page
+++ b/resources/src/main/resources/business-model/ervu-business-metrics/administration.page
@@ -3180,48 +3180,7 @@
     </complex>
 </value>
                             </item>
-                            <item id="6818c758-e636-4cfe-a49a-f3383ba40488" removed="false">
-<value>
-    <complex>
-        <entry>
-            <key>backgroundColor</key>
-            <value>
-                <simple>"#E9DECDFF"</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>chartType</key>
-            <value>
-                <simple>"BAR"</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>dataColumn</key>
-            <value>
-                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_administrator_military_office"}</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>dataLabel</key>
-            <value>
-                <simple>"Администратор военкомата"</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>labelColumn</key>
-            <value>
-                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_administrator_military_office"}</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>stack</key>
-            <value>
-                <simple>"Администратор военкомата"</simple>
-            </value>
-        </entry>
-    </complex>
-</value>
-                            </item>
+                            <item id="6818c758-e636-4cfe-a49a-f3383ba40488" removed="true"/>
                             <item id="72ee7da9-8f15-4cee-9002-30e0c10e7b61" removed="false">
 <value>
     <complex>
@@ -3306,7 +3265,92 @@
     </complex>
 </value>
                             </item>
-                            <item id="dbf25a8e-1076-43ef-b045-cf6f6281b6e4" removed="false">
+                            <item id="dbf25a8e-1076-43ef-b045-cf6f6281b6e4" removed="true"/>
+                            <item id="decb430b-3e2e-4622-bef9-794db51ff51a" removed="false">
+<value>
+    <complex>
+        <entry>
+            <key>backgroundColor</key>
+            <value>
+                <simple>"#E9DECDFF"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>chartType</key>
+            <value>
+                <simple>"BAR"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>dataColumn</key>
+            <value>
+                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>dataLabel</key>
+            <value>
+                <simple>"Ответственный за защиту информации"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>labelColumn</key>
+            <value>
+                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>stack</key>
+            <value>
+                <simple>"Ответственный за защиту информации"</simple>
+            </value>
+        </entry>
+    </complex>
+</value>
+                            </item>
+                            <item id="f2b75a1f-121f-41a4-95ba-1dae3ee2c37a" removed="false">
+<value>
+    <complex>
+        <entry>
+            <key>backgroundColor</key>
+            <value>
+                <simple>"#E9DECDFF"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>chartType</key>
+            <value>
+                <simple>"BAR"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>dataColumn</key>
+            <value>
+                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi_svk"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>dataLabel</key>
+            <value>
+                <simple>"Ответственный за защиту информации военного комиссариата субъекта РФ"</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>labelColumn</key>
+            <value>
+                <simple>{"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi_svk"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>stack</key>
+            <value>
+                <simple>"Ответственный за защиту информации военного комиссариата субъекта РФ"</simple>
+            </value>
+        </entry>
+    </complex>
+</value>
+                            </item>
+                            <item id="7132b973-412b-410c-991a-ccc623ec2fc5" removed="false">
 <value>
     <complex>
         <entry>
@@ -3346,6 +3390,7 @@
             </value>
         </entry>
     </complex>
+    <expanded>false</expanded>
 </value>
                             </item>
                             <item id="86ad1481-2dde-4c37-8ac3-d9631fb763d4" removed="true"/>
@@ -3375,6 +3420,7 @@
         <packageName>ervu_business_metrics.component.chart</packageName>
     </classRef>
     <enabled>true</enabled>
+    <expanded>true</expanded>
     <properties>
         <entry>
             <key>bars</key>
@@ -3399,7 +3445,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>462.0</simple>
+                            <simple>504.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3417,7 +3463,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>420.0</simple>
+                            <simple>462.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3435,7 +3481,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>378.0</simple>
+                            <simple>420.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3453,7 +3499,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>336.0</simple>
+                            <simple>378.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3471,7 +3517,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>294.0</simple>
+                            <simple>336.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3489,7 +3535,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>252.0</simple>
+                            <simple>294.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3507,7 +3553,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>210.0</simple>
+                            <simple>252.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3525,7 +3571,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>168.0</simple>
+                            <simple>210.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3543,7 +3589,7 @@
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>126.0</simple>
+                            <simple>168.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3555,13 +3601,13 @@
                     <entry>
                         <key>barStack</key>
                         <value>
-                            <simple>"Администратор военкомата"</simple>
+                            <simple>"Специалист ВК по ВУ"</simple>
                         </value>
                     </entry>
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>84.0</simple>
+                            <simple>126.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3573,13 +3619,13 @@
                     <entry>
                         <key>barStack</key>
                         <value>
-                            <simple>"Специалист ВК по ВУ"</simple>
+                            <simple>"Специалист по комплектованию"</simple>
                         </value>
                     </entry>
                     <entry>
                         <key>index</key>
                         <value>
-                            <simple>42.0</simple>
+                            <simple>84.0</simple>
                         </value>
                     </entry>
                 </complex>
@@ -3591,7 +3637,25 @@
                     <entry>
                         <key>barStack</key>
                         <value>
-                            <simple>"Специалист по комплектованию"</simple>
+                            <simple>"Ответственный за защиту информации"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>index</key>
+                        <value>
+                            <simple>42.0</simple>
+                        </value>
+                    </entry>
+                </complex>
+            </value>
+        </item>
+        <item id="063ba6b9-e328-4802-959a-9aff58da619f" removed="false">
+            <value>
+                <complex>
+                    <entry>
+                        <key>barStack</key>
+                        <value>
+                            <simple>"Ответственный за защиту информации военного комиссариата субъекта РФ"</simple>
                         </value>
                     </entry>
                     <entry>
@@ -3614,7 +3678,7 @@
 <entry>
     <key>max</key>
     <value>
-        <simple>480.0</simple>
+        <simple>520.0</simple>
     </value>
 </entry>
                             </complex>
@@ -3758,13 +3822,13 @@
                     <entry>
                         <key>height</key>
                         <value>
-                            <simple>"462px"</simple>
+                            <simple>"525px"</simple>
                         </value>
                     </entry>
                     <entry>
                         <key>margin</key>
                         <value>
-                            <simple>"10px 0px 0px 0px"</simple>
+                            <simple>"4px 0px 0px 0px"</simple>
                         </value>
                     </entry>
                 </complex>