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

Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8932_ervu_tooltip

Browse source
This commit is contained in:
Artyom Hackimullin 2025-04-07 17:27:07 +03:00
commit 183777dfbb
9 changed files with 215 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/package-lock.json generated
View file

@ -1748,9 +1748,9 @@
}
},
"@webbpm/base-package": {
"version": "3.192.5",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.5.tgz",
"integrity": "sha512-XR4POXXWmhlFOdd+yIR+1HIslOfFXnyPsmizcrzVRE3feVLJ8Hle+uQT1a2KsHD6bfdTGErVHfes/IKfmUZImg==",
"version": "3.192.6-SNAPSHOT-0404144846",
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.6-SNAPSHOT-0404144846.tgz",
"integrity": "sha512-/sDQLq+EH5/pxySKmW62eqUJ3gILCgfPYYm68mhmYbAC2jcOaV3sUUx736zG7UussNN6IAKZum+85JYIorf2sg==",
"requires": {
"tslib": "^1.9.0"
}

2
frontend/package.json
View file

@ -26,7 +26,7 @@
"@angular/platform-browser-dynamic": "7.2.15",
"@angular/router": "7.2.15",
"@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1",
"@webbpm/base-package": "3.192.5",
"@webbpm/base-package": "3.192.6-SNAPSHOT-0404144846",
"ag-grid-angular": "29.0.0-micord.4",
"ag-grid-community": "29.0.0-micord.4",
"angular-calendar": "0.28.28",

2
frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts
View file

@ -69,6 +69,6 @@ export class UnionAgeAndBirthDateTextScript extends Behavior {
private parseToIsoFormat(date: string): string {
let strings = date.split('.');
return `${strings[2]}-${1}-${strings[0]}`;
return `${strings[2]}-${strings[1]}-${strings[0]}`;
}
}

2
packages/ru.cg.webbpm.packages.base.resources/metadata/typescript.metadata.json
View file

File diff suppressed because one or more lines are too long

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

@ -6558,6 +6558,12 @@
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>theme</key>
<value>
<simple>"BALHAM_DARK"</simple>
@ -6899,6 +6905,12 @@
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>theme</key>
<value>
<simple>"BALHAM_DARK"</simple>

3
resources/src/main/resources/business-model/citizen.page
View file

@ -692,7 +692,7 @@
<entry>
<key>route</key>
<value>
<simple>"/citizen"</simple>
<simple>"/citizen_all_filters"</simple>
</value>
</entry>
<entry>
@ -4951,6 +4951,7 @@
<simple>"cell-font-narrow-small"</simple>
</value>
</item>
<item id="1f1ffa20-52a3-4af6-838f-a83cca7d705f" removed="true"/>
</value>
</entry>
</complex>

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

@ -693,7 +693,7 @@
<entry>
<key>route</key>
<value>
<simple>"/citizen"</simple>
<simple>"/citizen_all_filters"</simple>
</value>
</entry>
<entry>
@ -12232,6 +12232,7 @@
<componentRootId>53311501-55a7-4d20-8c51-569fefd5bf04</componentRootId>
<name>Tab item_Сведения о воинском учёте</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -46890,12 +46891,44 @@
</scripts>
</children>
</children>
<children id="85d14fb1-86e1-4c1e-b269-c24524f2ef42">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>85d14fb1-86e1-4c1e-b269-c24524f2ef42</componentRootId>
<name>Результаты поиска</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="57d340c5-5d7f-4a90-b2c5-c40e5a0e4b9a" removed="false">
<value>
<simple>"title"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>initialValue</key>
<value>
<simple>"Результаты поиска"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="640ac622-91a7-438d-b68d-596af564b389">
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
<componentRootId>640ac622-91a7-438d-b68d-596af564b389</componentRootId>
<name>Таблица данные</name>
<name>Таблица данные стар</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
<properties>
@ -46912,6 +46945,16 @@
</value>
</entry>
<entry>
<key>cssClasses</key>
<value>
<item id="e8702c87-10fa-45c3-bd9d-24a6c721e7b7" removed="false">
<value>
<simple>"grid-with-indents-border"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>fetchSize</key>
<value>
<simple>10.0</simple>
@ -46965,7 +47008,7 @@
<entry>
<key>dependencyLink</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"applied_fact"}</simple>
<simple>null</simple>
</value>
</entry>
<entry>
@ -46997,24 +47040,7 @@
<entry>
<key>columnSorts</key>
<value>
<item id="ce5a141a-7411-4397-911a-7b005041ee04" removed="false">
<value>
<complex>
<entry>
<key>field</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"sort"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="ce5a141a-7411-4397-911a-7b005041ee04" removed="true"/>
</value>
</entry>
</properties>
@ -47071,36 +47097,6 @@
</entry>
</properties>
</scripts>
<children id="475a84c0-42c0-49a7-93fd-461ba5dad323">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>475a84c0-42c0-49a7-93fd-461ba5dad323</componentRootId>
<name>sort</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>displayType</key>
<value>
<simple>"ONE_COLUMN"</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"sort"}</simple>
</value>
</entry>
<entry>
<key>hidden</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="083ddf4e-73b6-498f-8ee1-9911c5328628">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>083ddf4e-73b6-498f-8ee1-9911c5328628</componentRootId>
@ -47213,6 +47209,12 @@
<simple>"ФИО"</simple>
</value>
</entry>
<entry>
<key>displayPopup</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>displayType</key>
<value>
@ -47228,7 +47230,7 @@
<entry>
<key>width</key>
<value>
<simple>450</simple>
<simple>350</simple>
</value>
</entry>
<entry>
@ -47275,6 +47277,55 @@
<value>
<simple>{"objectId":"4d3c62aa-21c7-4c3b-a08f-27539d5c8906","packageName":"component.grid","className":"GridV2Column","type":"TS"}</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="f9ca8418-a4a9-4c86-b955-2da325f453bf">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>f9ca8418-a4a9-4c86-b955-2da325f453bf</componentRootId>
<name>Возраст</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
<simple>"Возраст"</simple>
</value>
</entry>
<entry>
<key>displayType</key>
<value>
<simple>"ONE_COLUMN"</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"age"}</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>80</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
@ -47321,56 +47372,7 @@
<entry>
<key>width</key>
<value>
<simple>450</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="f9ca8418-a4a9-4c86-b955-2da325f453bf">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>f9ca8418-a4a9-4c86-b955-2da325f453bf</componentRootId>
<name>Возраст</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
<simple>"Возраст"</simple>
</value>
</entry>
<entry>
<key>displayType</key>
<value>
<simple>"ONE_COLUMN"</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"age"}</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>120</simple>
<simple>500</simple>
</value>
</entry>
<entry>
@ -47418,7 +47420,7 @@
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
<simple>false</simple>
</value>
</entry>
<entry>

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

@ -749,7 +749,6 @@
<componentRootId>d0322950-9802-44a1-a888-cf8e540ee2d8</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -856,6 +855,13 @@
</properties>
</scripts>
</children>
<children id="6de3215f-6690-49d1-87b8-6c58ccdcae79">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>6de3215f-6690-49d1-87b8-6c58ccdcae79</componentRootId>
<name>Возраст с датой рождения</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="d5e36f60-b04c-4e95-a4e7-85b26cda9e4f">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>d5e36f60-b04c-4e95-a4e7-85b26cda9e4f</componentRootId>
@ -3129,7 +3135,6 @@
<componentRootId>a38f8e65-4db5-449b-91c5-ed62bf59bc5d</componentRootId>
<name>Сведения о семье</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -4146,16 +4151,22 @@
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>DateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>dataConverter</key>
<value>
<implRef type="JAVA">
<className>StringValueConverter</className>
<packageName>component.field.dataconvert</packageName>
</implRef>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
@ -5176,7 +5187,6 @@
<componentRootId>56787a06-cbb0-457a-a4e4-6589b6413d97</componentRootId>
<name>HB - дата выдачи документа ВУ, военкомат</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -5364,7 +5374,6 @@
<componentRootId>a554110d-a3e4-49f0-8c76-1f2ab57748ca</componentRootId>
<name>HB - наличие отсрочки или освобождения</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -5953,6 +5962,42 @@
</complex>
</value>
</item>
<item id="20eb16fe-26ff-4b05-82a4-c1a2487e0a1b" removed="false">
<value>
<complex>
<entry>
<key>value</key>
<value>
<simple>"Да"</simple>
</value>
</entry>
<entry>
<key>valueToReplace</key>
<value>
<simple>"true"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="b0496f28-a035-4e72-8edb-2ed37a88be6e" removed="false">
<value>
<complex>
<entry>
<key>value</key>
<value>
<simple>"Нет"</simple>
</value>
</entry>
<entry>
<key>valueToReplace</key>
<value>
<simple>"false"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</complex>

39
resources/src/main/resources/business-model/ratings.page
View file

@ -766,7 +766,6 @@
<componentRootId>aca06a3f-55ff-4c8b-87ed-1aa8651fd19c</componentRootId>
<name>VB - Явка по повестке</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1002,6 +1001,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
@ -1258,6 +1263,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
@ -1462,7 +1473,6 @@
<componentRootId>faca77fc-bc58-4e88-9398-b1b87c21509a</componentRootId>
<name>VB - Призыв</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1682,6 +1692,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
@ -1968,6 +1984,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
@ -2178,7 +2200,6 @@
<componentRootId>c9ca440c-75de-4d52-bdbd-4e67d926afb5</componentRootId>
<name>VB - Рассмотрение жалоб</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2372,6 +2393,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
@ -2622,6 +2649,12 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>suppressMovableColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>