Правки с добавлением условия
This commit is contained in:
Foat Saliakhov
parent
0fed8e0f07
commit
3a443a2584
1 changed files with 16 additions and 192 deletions
|
|
@ -778,25 +778,6 @@
|
|||
<entry>
|
||||
<key>service</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>loadDao</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>graph</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
<implRef type="JAVA">
|
||||
<className>LinkFieldDao</className>
|
||||
<packageName>dao.field</packageName>
|
||||
</implRef>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
<implRef/>
|
||||
</value>
|
||||
</entry>
|
||||
|
|
@ -845,20 +826,6 @@
|
|||
<enabled>false</enabled>
|
||||
</scripts>
|
||||
</children>
|
||||
<children id="c4f80238-7fd4-4898-9b4c-effeab531ab8">
|
||||
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
|
||||
<componentRootId>c4f80238-7fd4-4898-9b4c-effeab531ab8</componentRootId>
|
||||
<name>Период</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="66529bfd-f2ef-498c-93b1-e30fe702b5e8">
|
||||
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
|
||||
<componentRootId>66529bfd-f2ef-498c-93b1-e30fe702b5e8</componentRootId>
|
||||
<name>Фильтр</name>
|
||||
<container>true</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="6ccd0dc6-8594-4477-ac10-6fe9331a659d">
|
||||
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
|
||||
<componentRootId>6ccd0dc6-8594-4477-ac10-6fe9331a659d</componentRootId>
|
||||
|
|
@ -882,7 +849,6 @@
|
|||
<componentRootId>de763c9a-3afb-481e-83e5-c3a83a320711</componentRootId>
|
||||
<name>ВК График</name>
|
||||
<container>true</container>
|
||||
<expanded>false</expanded>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
||||
<properties>
|
||||
|
|
@ -964,7 +930,7 @@
|
|||
<entry>
|
||||
<key>graph</key>
|
||||
<value>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"registered_citizens":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"registered_citizens":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
|
|
@ -1599,168 +1565,26 @@
|
|||
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
|
||||
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
|
||||
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
|
||||
<children id="472b80c1-e78d-4170-8d16-c1a5aefec69b">
|
||||
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
|
||||
<componentRootId>472b80c1-e78d-4170-8d16-c1a5aefec69b</componentRootId>
|
||||
<name>Выбрать период</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="66529bfd-f2ef-498c-93b1-e30fe702b5e8">
|
||||
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
|
||||
<componentRootId>66529bfd-f2ef-498c-93b1-e30fe702b5e8</componentRootId>
|
||||
<name>Фильтр</name>
|
||||
<container>true</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
||||
<properties>
|
||||
<entry>
|
||||
<key>loadOnStart</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>style</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>width</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
</scripts>
|
||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
||||
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
|
||||
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
|
||||
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
|
||||
<children id="6415ca58-145a-4fff-9a6c-06b35a2d92fd">
|
||||
<prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
|
||||
<componentRootId>6415ca58-145a-4fff-9a6c-06b35a2d92fd</componentRootId>
|
||||
<name>Числовое поле</name>
|
||||
<container>false</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="a6c37a96-2bfd-40f4-bd4a-a97c3443b9c0">
|
||||
<properties>
|
||||
<entry>
|
||||
<key>cssClasses</key>
|
||||
<value>
|
||||
<item id="77eb18ee-d427-4c4d-adda-c6e55e48aaae" removed="false">
|
||||
<value>
|
||||
<simple>"small"</simple>
|
||||
</value>
|
||||
</item>
|
||||
<item id="f5d53af6-c043-4883-b437-bbc7fd09ff2f" removed="true"/>
|
||||
<item id="6bccf0cf-4511-4a75-a603-552ee8090292" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>errorTooltipStyle</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>border</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>height</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>width</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
<expanded>false</expanded>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>label</key>
|
||||
<value>
|
||||
<simple>"Период от:"</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>min</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>style</key>
|
||||
<value>
|
||||
<complex>
|
||||
<entry>
|
||||
<key>stretch</key>
|
||||
<value>
|
||||
<simple>null</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</complex>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
</scripts>
|
||||
<scripts id="82c295cd-372d-4867-87b4-d6e22e3071e7"/>
|
||||
<scripts id="9304bfac-45fd-43bc-96f6-a2414a59a2d7"/>
|
||||
<scripts id="9bb9b2a8-7cd9-4926-a4ac-64ff03a32d45"/>
|
||||
<scripts id="03f9d840-8262-4771-a9e2-9a9fc3504f8b">
|
||||
<enabled>false</enabled>
|
||||
</scripts>
|
||||
</children>
|
||||
<children id="46bbc703-9a8a-4b37-8af9-34f1a0fbec46">
|
||||
<prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
|
||||
<componentRootId>46bbc703-9a8a-4b37-8af9-34f1a0fbec46</componentRootId>
|
||||
<name>Числовое поле</name>
|
||||
<container>false</container>
|
||||
<childrenReordered>false</childrenReordered>
|
||||
<scripts id="a6c37a96-2bfd-40f4-bd4a-a97c3443b9c0">
|
||||
<properties>
|
||||
<entry>
|
||||
<key>cssClasses</key>
|
||||
<value>
|
||||
<item id="04f92f6b-a140-43dd-9a07-9cc0b08a542d" removed="false">
|
||||
<value>
|
||||
<simple>"small"</simple>
|
||||
</value>
|
||||
</item>
|
||||
<item id="f5d53af6-c043-4883-b437-bbc7fd09ff2f" removed="true"/>
|
||||
<item id="6bccf0cf-4511-4a75-a603-552ee8090292" removed="true"/>
|
||||
</value>
|
||||
</entry>
|
||||
<entry>
|
||||
<key>label</key>
|
||||
<value>
|
||||
<simple>"Период по:"</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
</scripts>
|
||||
<scripts id="82c295cd-372d-4867-87b4-d6e22e3071e7"/>
|
||||
<scripts id="9304bfac-45fd-43bc-96f6-a2414a59a2d7"/>
|
||||
<scripts id="9bb9b2a8-7cd9-4926-a4ac-64ff03a32d45"/>
|
||||
<scripts id="03f9d840-8262-4771-a9e2-9a9fc3504f8b">
|
||||
<enabled>false</enabled>
|
||||
</scripts>
|
||||
</children>
|
||||
<children id="81b59558-de4d-43db-a33a-c55405a43f43">
|
||||
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
|
||||
<componentRootId>81b59558-de4d-43db-a33a-c55405a43f43</componentRootId>
|
||||
<name>От:</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="ffa70c8e-a478-49b6-99d7-f5e2ddb3e6e5">
|
||||
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
|
||||
<componentRootId>ffa70c8e-a478-49b6-99d7-f5e2ddb3e6e5</componentRootId>
|
||||
<name>По:</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="c9d19be7-5856-4da6-8d9a-b05232f72cbf">
|
||||
<prototypeId>fd7e47b9-dce1-4d14-9f3a-580c79f59579</prototypeId>
|
||||
<componentRootId>c9d19be7-5856-4da6-8d9a-b05232f72cbf</componentRootId>
|
||||
<name>Применить</name>
|
||||
<container>false</container>
|
||||
<removed>true</removed>
|
||||
</children>
|
||||
<children id="6415ca58-145a-4fff-9a6c-06b35a2d92fd">
|
||||
<prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue