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

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
* origin/develop:
  ERVU-444 : add recruit_id in diploma tables
  fix reset filters by setting initial values into hidden text fields filters
This commit is contained in:
Фоат Саляхов 2025-04-29 18:01:02 +03:00
commit 1db57837b7
3 changed files with 278 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

36
backend/src/main/resources/config/v_1.10/20250427-ERVU-438_education_structure.xml
View file

@ -488,4 +488,40 @@
<dropTable tableName="citizen_education_diploma" schemaName="ervu_dashboard"/>
</rollback>
</changeSet>
<changeSet id="0014" author="AlexSave">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="citizen_education_diploma" columnName="recruit_id"/>
</not>
</preConditions>
<addColumn tableName="citizen_education_diploma">
<column name="recruit_id" type="uuid" remarks="Идентификатор рекрута">
<constraints nullable="false"/>
</column>
</addColumn>
<rollback>
<dropColumn tableName="citizen_education_diploma" columnName="recruit_id"/>
</rollback>
</changeSet>
<changeSet id="0015" author="AlexSave">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="citizen_foreign_education_diploma" columnName="recruit_id"/>
</not>
</preConditions>
<addColumn tableName="citizen_foreign_education_diploma">
<column name="recruit_id" type="uuid" remarks="Идентификатор рекрута">
<constraints nullable="false"/>
</column>
</addColumn>
<rollback>
<dropColumn tableName="citizen_foreign_education_diploma" columnName="recruit_id"/>
</rollback>
</changeSet>
</databaseChangeLog>

10
frontend/src/ts/ervu-dashboard/component/filter/TextInitialValue.ts Normal file
View file

@ -0,0 +1,10 @@
import {AnalyticalScope, Behavior, TextBase, Visible} from "@webbpm/base-package";
@AnalyticalScope(TextBase)
export class TextInitialValue extends Behavior {
@Visible()
public setInitialValue(value: string): void {
const textScript = this.getScript(TextBase);
textScript.initialValue = value;
}
}

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

@ -790,6 +790,206 @@
</complex>
</value>
</item>
<item id="730d7ca8-58be-4f5c-a2c4-5536f40ee62a" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"fd1da81c-b775-487b-ae40-404f011106df","packageName":"ervu-dashboard.component.filter","className":"TextInitialValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setInitialValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"6e4153d6-4698-4ef0-a925-cf6a74441435","packageName":"ervu-dashboard.component.filter","className":"DropdownTreeViewModelFilterValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getIds"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="a838300a-933f-4505-a6e8-9e7844e841f0" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"72a0cb73-ecdf-4d2e-9cd2-3a7f4f72b16c","packageName":"ervu-dashboard.component.filter","className":"TextInitialValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setInitialValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"6e4153d6-4698-4ef0-a925-cf6a74441435","packageName":"ervu-dashboard.component.filter","className":"DropdownTreeViewModelFilterValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getIds"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="1748bf74-dcfe-4896-b1c4-cece404b10a6" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d05300c8-d413-4bd1-b010-e553290e8cab","packageName":"ervu-dashboard.component.filter","className":"TextInitialValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setInitialValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"6e4153d6-4698-4ef0-a925-cf6a74441435","packageName":"ervu-dashboard.component.filter","className":"DropdownTreeViewModelFilterValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getIds"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="7b3320a8-8fac-4144-8cf8-14037928ae27" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"2306126b-f00d-420f-8323-3bda42311109","packageName":"ervu-dashboard.component.filter","className":"TextInitialValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setInitialValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"6e4153d6-4698-4ef0-a925-cf6a74441435","packageName":"ervu-dashboard.component.filter","className":"DropdownTreeViewModelFilterValue","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getIds"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="58a0713d-33a2-4895-b67e-44212cf3af39" removed="true"/>
<item id="86b62c6c-27e8-42e6-9cb5-6fce429ff5a3" removed="true"/>
<item id="6618ca88-e338-4140-a3b4-32b3ad04226e" removed="true"/>
@ -1448,6 +1648,14 @@
<enabled>false</enabled>
</scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
<scripts id="bdcd524e-cabb-4ba3-9af5-e720187b37dc">
<classRef type="TS">
<className>TextInitialValue</className>
<packageName>ervu-dashboard.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</children>
<children id="72a0cb73-ecdf-4d2e-9cd2-3a7f4f72b16c">
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
@ -1495,6 +1703,14 @@
<enabled>false</enabled>
</scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
<scripts id="0a7026de-a96c-49eb-a4a4-d22b855601e8">
<classRef type="TS">
<className>TextInitialValue</className>
<packageName>ervu-dashboard.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</children>
<children id="07f8838c-091b-4491-b4b4-d9296a2d88a9">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
@ -6605,6 +6821,14 @@
<enabled>false</enabled>
</scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
<scripts id="75a61f93-f8a3-447a-973e-51e10c4d5d25">
<classRef type="TS">
<className>TextInitialValue</className>
<packageName>ervu-dashboard.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</children>
<children id="d05300c8-d413-4bd1-b010-e553290e8cab">
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
@ -6652,6 +6876,14 @@
<enabled>false</enabled>
</scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
<scripts id="50c92d10-c973-438a-b36a-c6d842a2c7ac">
<classRef type="TS">
<className>TextInitialValue</className>
<packageName>ervu-dashboard.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</children>
<children id="a7223e29-7f88-4d40-980d-68a0d9834c93">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>