micord/evru-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fix_treeview_filter

Browse source
This commit is contained in:
Булат Хайруллин 2025-04-21 00:37:13 +03:00
commit 882c8e20d1
3 changed files with 133 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
resources/src/main/resources/business-model/appeals.page
View file

@ -6595,7 +6595,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"region","schemaName":"space","x":350.4000000000002,"y":156.8,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"region","schemaName":"space","x":350.4000000000002,"y":156.8,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"region":{"tableName":"region","schemaName":"space","x":350.4000000000002,"y":156.8,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"review_rating":{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"review_rating","refToEntityName":"region","refToColumns":[{"schema":"space","table":"region","entity":"region","name":"id_region"}],"refOnColumns":[{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":389.60000000000014,"y":157.59999999999997,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":389.60000000000014,"y":157.59999999999997,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":389.60000000000014,"y":157.59999999999997,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"review_rating":{"tableName":"review_rating","schemaName":"appeals","x":169.0,"y":153.2,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"review_rating","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -6666,6 +6666,12 @@
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -6681,7 +6687,7 @@
<entry>
<key>field</key>
<value>
<simple>{"schema":"space","table":"region","entity":"region","name":"region"}</simple>
<simple>{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"shortname"}</simple>
</value>
</entry>
</properties>
@ -6942,7 +6948,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"region","schemaName":"space","x":434.4000000000001,"y":200.79999999999995,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"region","schemaName":"space","x":434.4000000000001,"y":200.79999999999995,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"region":{"tableName":"region","schemaName":"space","x":434.4000000000001,"y":200.79999999999995,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"review_rating":{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"review_rating","refToEntityName":"region","refToColumns":[{"schema":"space","table":"region","entity":"region","name":"id_region"}],"refOnColumns":[{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":467.20000000000005,"y":214.39999999999998,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":467.20000000000005,"y":214.39999999999998,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":467.20000000000005,"y":214.39999999999998,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"review_rating":{"tableName":"review_rating","schemaName":"appeals","x":254.0,"y":193.0,"alias":"review_rating","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"rating"},"operation":"LESS_THAN","typeCode":"CONST","values":["3.5"]},{"column":{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"review_rating","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"appeals","table":"review_rating","entity":"review_rating","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -7013,6 +7019,12 @@
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -7028,7 +7040,7 @@
<entry>
<key>field</key>
<value>
<simple>{"schema":"space","table":"region","entity":"region","name":"region"}</simple>
<simple>{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"shortname"}</simple>
</value>
</entry>
</properties>

43
resources/src/main/resources/business-model/citizen_all_filters.page
View file

File diff suppressed because one or more lines are too long

87
resources/src/main/resources/business-model/citizencard.page
View file

File diff suppressed because one or more lines are too long