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

Merge remote-tracking branch 'origin/forecast_v1_ERVU-266' into forecast_v1_ERVU-266

Browse source 
* origin/forecast_v1_ERVU-266:
  fix test (2)
  fix test
  Правки с добавлением условия
  Тестовые правки
  input fix
  /
This commit is contained in:
Фоат Саляхов 2025-03-04 09:47:23 +03:00
commit b0d2a726e9
3 changed files with 21 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/resources/css/components-dashboard.css
View file

@ -476,7 +476,8 @@
background-color: transparent;
}
.webbpm.ervu_dashboard .selectize-control .selectize-input,
.webbpm.ervu_dashboard input {
.webbpm.ervu_dashboard input,
.webbpm.ervu_dashboard input[disabled] {
color: var(--color-text-primary);
font-size: var(--size-text-primary);
min-height: max-content;
@ -484,7 +485,7 @@
margin-bottom: 0;
border-radius: 100px;
border: 0;
background-color: var(--color-dark-20) !important;
background-color: var(--color-dark-20);
}
.webbpm.ervu_dashboard .selectize-control .selectize-input {
display: flex;

4
pom.xml
View file

@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enable.version.in.url>false</enable.version.in.url>
<joda-time.version>2.9.2</joda-time.version>
<webbpm-platform.version>3.185.1</webbpm-platform.version>
<webbpm-platform.version>3.185.5-SNAPSHOT</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout>
</properties>
<dependencyManagement>
@ -40,7 +40,7 @@
<dependency>
<groupId>ru.cg.webbpm.packages.base</groupId>
<artifactId>backend</artifactId>
<version>3.185.3-SNAPSHOT</version>
<version>3.185.5-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>

193
resources/src/main/resources/business-model/forecast.page
View file

@ -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,165 +826,11 @@
<enabled>false</enabled>
</scripts>
</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="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="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>
</children>
<children id="6ccd0dc6-8594-4477-ac10-6fe9331a659d">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>6ccd0dc6-8594-4477-ac10-6fe9331a659d</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"/>
@ -1022,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>
@ -1104,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>
@ -1706,7 +1532,6 @@
<componentRootId>fd83bbd3-7ef2-4fca-8b07-10f8a555754a</componentRootId>
<name>ВК Показатели</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1740,11 +1565,25 @@
<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>
<name>Фильтр</name>
<container>true</container>
<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">