Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
This commit is contained in:
commit
553d23f0b2
1 changed files with 66 additions and 46 deletions
|
|
@ -42,7 +42,7 @@
|
|||
<entry>
|
||||
<key>graph</key>
|
||||
<value>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"Идентификатор организации\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"Идентификатор организации\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"Идентификатор организации\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
|
|
@ -66,18 +66,18 @@
|
|||
</scripts>
|
||||
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
|
||||
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
|
||||
<children id="f799483f-b32d-4131-8fd7-1672d422d063">
|
||||
<prototypeId>be0e38c3-01c2-4122-85dd-1b6e176f543d</prototypeId>
|
||||
<componentRootId>f799483f-b32d-4131-8fd7-1672d422d063</componentRootId>
|
||||
<name>Список (колонка)</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="138a1102-f344-4356-8603-d0e06bd833e8">
|
||||
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
|
||||
<componentRootId>138a1102-f344-4356-8603-d0e06bd833e8</componentRootId>
|
||||
<name>Выпадающий список РФ, уровни</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="32c1ef3d-c802-4fff-99f4-f6a59c6902aa">
|
||||
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
|
||||
<componentRootId>32c1ef3d-c802-4fff-99f4-f6a59c6902aa</componentRootId>
|
||||
<name>Выпадающий список РФ</name>
|
||||
<container>false</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
|
||||
<properties>
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<entry>
|
||||
<key>columnSorts</key>
|
||||
<value>
|
||||
<item id="17f57214-30b4-4ffa-ab6d-f77f1a6d6048" removed="false">
|
||||
<item id="698d60cd-37c3-41af-8f76-dbe951fed23a" removed="false">
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
|
|
@ -122,7 +122,6 @@
|
|||
</complex>
|
||||
</value>
|
||||
</item>
|
||||
<item id="c2c2fd2c-395a-4434-98c5-af6672ead7af" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -131,12 +130,6 @@
|
|||
<simple>{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"shortname"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>filterColumn</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>loadDao</key>
|
||||
<value>
|
||||
|
|
@ -144,24 +137,12 @@
|
|||
<entry>
|
||||
<key>graph</key>
|
||||
<value>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":219.0,"y":148.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":219.0,"y":148.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":219.0,"y":148.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>uniqueResult</key>
|
||||
<value>
|
||||
<simple>false</simple>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":259.0,"y":185.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":259.0,"y":185.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":259.0,"y":185.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>parentControlReference</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
@ -188,7 +169,7 @@
|
|||
<scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
|
||||
<enabled>false</enabled>
|
||||
</scripts>
|
||||
<scripts id="fa1b3cb0-e437-4bd6-9b44-8b398247641a">
|
||||
<scripts id="0abf1305-b1bc-430f-8833-9190192ed109">
|
||||
<classRef type="TS">
|
||||
<className>ComboboxFilterComponent</className>
|
||||
<packageName>ervu-dashboard.component.filter</packageName>
|
||||
|
|
@ -211,6 +192,13 @@
|
|||
</properties>
|
||||
</scripts>
|
||||
</children>
|
||||
<children id="f799483f-b32d-4131-8fd7-1672d422d063">
|
||||
<prototypeId>be0e38c3-01c2-4122-85dd-1b6e176f543d</prototypeId>
|
||||
<componentRootId>f799483f-b32d-4131-8fd7-1672d422d063</componentRootId>
|
||||
<name>Список (колонка)</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="99b260f1-a3ee-4d32-a075-ff41046caac6">
|
||||
<prototypeId>2a9ac61f-9345-4df1-9393-2a7f451fe72d</prototypeId>
|
||||
<componentRootId>99b260f1-a3ee-4d32-a075-ff41046caac6</componentRootId>
|
||||
|
|
@ -1031,7 +1019,6 @@
|
|||
<componentRootId>f0de3e02-1107-4c9d-a80d-d3439f8cf17e</componentRootId>
|
||||
<name>ГК График и показатели</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0">
|
||||
|
|
@ -1082,7 +1069,7 @@
|
|||
<entry>
|
||||
<key>behavior</key>
|
||||
<value>
|
||||
<simple>{"objectId":"138a1102-f344-4356-8603-d0e06bd833e8","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
|
||||
<simple>{"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -1115,7 +1102,7 @@
|
|||
<entry>
|
||||
<key>behavior</key>
|
||||
<value>
|
||||
<simple>{"objectId":"138a1102-f344-4356-8603-d0e06bd833e8","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
|
||||
<simple>{"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -1185,6 +1172,7 @@
|
|||
<componentRootId>d5bdc0f2-4fe9-4f15-9173-8f36ccbdb4a8</componentRootId>
|
||||
<name>ВК График</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e">
|
||||
|
|
@ -1462,7 +1450,7 @@
|
|||
<entry>
|
||||
<key>filterComponent</key>
|
||||
<value>
|
||||
<simple>{"objectId":"138a1102-f344-4356-8603-d0e06bd833e8","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
|
||||
<simple>{"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
|
|
@ -1511,7 +1499,7 @@
|
|||
<value>
|
||||
<item id="4274e3e2-a120-4543-9a12-01d05160fd1f" removed="false">
|
||||
<value>
|
||||
<simple>{"objectId":"138a1102-f344-4356-8603-d0e06bd833e8","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
|
||||
<simple>{"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
|
||||
</value>
|
||||
</item>
|
||||
</value>
|
||||
|
|
@ -1602,6 +1590,9 @@
|
|||
<entry>
|
||||
<key>replaceModels</key>
|
||||
<value>
|
||||
<item id="51677b3f-b123-4020-ae31-840388756e4c" removed="true"/>
|
||||
<item id="4abbc3d5-79ff-4307-b236-ff48b3b604f8" removed="true"/>
|
||||
<item id="deebb63e-ebbc-471c-bd24-1f44840762e8" removed="true"/>
|
||||
<item id="01fe78bf-de62-4314-aab8-1602f296e6fc" removed="true"/>
|
||||
<item id="b5a35b1c-5f39-4db9-ad4f-97e32dee86bd" removed="true"/>
|
||||
</value>
|
||||
|
|
@ -1745,6 +1736,18 @@
|
|||
<entry>
|
||||
<key>replaceModels</key>
|
||||
<value>
|
||||
<item id="c8cdc69a-972c-46e4-aff2-40a43d7f4339" removed="false">
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>value</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</item>
|
||||
<item id="78b951d5-263c-4531-a8e7-93393f9e8194" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
@ -1813,6 +1816,12 @@
|
|||
<key>textFormatter</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>replaceModels</key>
|
||||
<value>
|
||||
<item id="f1a176ee-acd6-4d9b-9892-650481fc7303" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>unitsText</key>
|
||||
<value>
|
||||
|
|
@ -1943,6 +1952,18 @@
|
|||
<entry>
|
||||
<key>replaceModels</key>
|
||||
<value>
|
||||
<item id="1540eceb-ba50-4540-8205-521492b352a8" removed="false">
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>value</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</item>
|
||||
<item id="8d0fe0be-a194-484e-8788-1497e8cb6bb9" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
@ -2010,6 +2031,12 @@
|
|||
<key>textFormatter</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>replaceModels</key>
|
||||
<value>
|
||||
<item id="5527dc38-6f61-4f0c-aee5-632bca3e2958" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>unitsText</key>
|
||||
<value>
|
||||
|
|
@ -2107,7 +2134,6 @@
|
|||
<componentRootId>83e0826b-245a-4f85-bf85-93761bbf04d8</componentRootId>
|
||||
<name>ВК Записи, неидентифицированные в ГИР ВУ</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
||||
<properties>
|
||||
|
|
@ -2434,7 +2460,6 @@
|
|||
<componentRootId>1d2e56da-8b89-4a4c-aa21-bb1a81942e1c</componentRootId>
|
||||
<name>ВК Показатели</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
||||
|
|
@ -2446,7 +2471,6 @@
|
|||
<componentRootId>2a1890b1-6d0d-4a62-aedb-4156d8ec4ae6</componentRootId>
|
||||
<name>ГК Показатель</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
||||
|
|
@ -2527,7 +2551,6 @@
|
|||
<componentRootId>558e95ac-19bb-4977-8f03-583ebe42326f</componentRootId>
|
||||
<name>ГК Показатель</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
||||
|
|
@ -2582,6 +2605,7 @@
|
|||
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
|
||||
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
|
||||
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
|
||||
<enabled>false</enabled>
|
||||
<properties>
|
||||
<entry>
|
||||
<key>loadType</key>
|
||||
|
|
@ -2636,7 +2660,6 @@
|
|||
<componentRootId>e7a950c7-ed00-4499-b1b5-bbc87b467ad4</componentRootId>
|
||||
<name>ГК Показатель</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
||||
|
|
@ -2691,6 +2714,7 @@
|
|||
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
|
||||
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
|
||||
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
|
||||
<enabled>false</enabled>
|
||||
<properties>
|
||||
<entry>
|
||||
<key>loadType</key>
|
||||
|
|
@ -2795,7 +2819,6 @@
|
|||
<componentRootId>262d6822-7513-42dd-946b-8f476683a9b4</componentRootId>
|
||||
<name>ВК Загрузка записей в ГИС ЕРВУ</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
||||
<properties>
|
||||
|
|
@ -2923,7 +2946,6 @@
|
|||
<componentRootId>a1ecae93-524d-43a2-bcff-5f38bc9f1825</componentRootId>
|
||||
<name>ВК График</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
||||
|
|
@ -3124,6 +3146,7 @@
|
|||
<componentRootId>55a4f844-adb6-46bb-8a79-b7fdcaf719b3</componentRootId>
|
||||
<name>ВК Показатели</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
||||
|
|
@ -3490,7 +3513,6 @@
|
|||
<componentRootId>35040ac0-0b14-46dd-888b-266d98fe6a49</componentRootId>
|
||||
<name>ГК График и показатели</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
||||
|
|
@ -3812,7 +3834,6 @@
|
|||
<componentRootId>ef1fb695-3692-43e0-bcb0-dd8b8feece1c</componentRootId>
|
||||
<name>ВК График</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
||||
|
|
@ -4898,7 +4919,6 @@
|
|||
<componentRootId>c26ec47a-4a66-4660-b6a4-afb54fba8ac0</componentRootId>
|
||||
<name>ВК График</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
||||
|
|
@ -4908,7 +4928,7 @@
|
|||
<children id="8127dd1f-8a72-4ca5-8446-b43e415833df">
|
||||
<prototypeId>85eb12aa-f878-4e29-b109-9d31af0fefb4</prototypeId>
|
||||
<componentRootId>8127dd1f-8a72-4ca5-8446-b43e415833df</componentRootId>
|
||||
<name>График 4</name>
|
||||
<name>График 5</name>
|
||||
<container>true</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="91bb6758-e763-48f4-bc41-638f59ee99db">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue