micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ERVU-342' into SUPPORT-8943_seamlessness

Browse source
This commit is contained in:
Makarova Elena 2025-03-20 12:14:17 +03:00
commit c423d602d5
5 changed files with 20 additions and 516 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/package-lock.json generated
View file

@ -4268,9 +4268,9 @@
"dev": true
},
"inputmask": {
"version": "5.0.5-cg.2",
"resolved": "https://repo.micord.ru/repository/npm-all/inputmask/-/inputmask-5.0.5-cg.2.tgz",
"integrity": "sha512-gd2NTwPedZNdZ97Gxcsm3xjpJnuo0blPczOdvi9p/OyKisx2byMultQrWvi9bF3pmRH0a8uC/5tt5wxPjXyTDw=="
"version": "5.0.10-beta.37",
"resolved": "https://repo.micord.ru/repository/npm-all/inputmask/-/inputmask-5.0.10-beta.37.tgz",
"integrity": "sha512-01fRvuo1ck4+/ttrSRFhLJ0exzFYdj2Q5x3qfBu4uJ/r0F81qFGpseHPcwK1e3YQL0531jew4Ipt3UCUCPA4CA=="
},
"inquirer": {
"version": "6.2.1",
@ -4938,9 +4938,9 @@
"dev": true
},
"nan": {
"version": "2.22.0",
"resolved": "https://repo.micord.ru/repository/npm-all/nan/-/nan-2.22.0.tgz",
"integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
"version": "2.22.2",
"resolved": "https://repo.micord.ru/repository/npm-all/nan/-/nan-2.22.2.tgz",
"integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
"dev": true,
"optional": true
},

2
frontend/package.json
View file

@ -43,7 +43,7 @@
"esmarttokenjs": "2.2.1-cg",
"font-awesome": "4.7.0",
"google-libphonenumber": "3.0.9",
"inputmask": "5.0.5-cg.2",
"inputmask": "5.0.10-beta.37",
"jquery": "3.7.1",
"js-year-calendar": "1.0.0-cg.2",
"jsgantt-improved": "2.0.10-cg",

153
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
View file

@ -326,41 +326,7 @@
<entry>
<key>elseActions</key>
<value>
<item id="46cd4a5a-ee4e-4399-9426-5aacbb856be2" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c64879eb-413b-4590-bccb-876139b24881","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="46cd4a5a-ee4e-4399-9426-5aacbb856be2" removed="true"/>
<item id="ac08d39f-2342-4471-b763-2a798f7f344a" removed="false">
<value>
<complex>
@ -616,41 +582,7 @@
</complex>
</value>
</item>
<item id="234072de-7635-4db5-8f45-b73e59d5b948" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c64879eb-413b-4590-bccb-876139b24881","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="234072de-7635-4db5-8f45-b73e59d5b948" removed="true"/>
<item id="896fc5ac-ee75-4637-89c0-834a30fd6958" removed="false">
<value>
<complex>
@ -1552,13 +1484,6 @@
</properties>
</scripts>
</children>
<children id="8cb02109-4e36-4250-b40c-6767a3b96421">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>8cb02109-4e36-4250-b40c-6767a3b96421</componentRootId>
<name>AC_ANY_comment</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="522f1f66-b490-45d4-ab45-0e4cacfe63a2">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>522f1f66-b490-45d4-ab45-0e4cacfe63a2</componentRootId>
@ -3461,79 +3386,7 @@
<componentRootId>c64879eb-413b-4590-bccb-876139b24881</componentRootId>
<name>Примечание по изменениям</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="aedd85c8-33a7-46fa-af8e-fdd4ef16a933" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>disabled</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>inheritParent</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"Примечание по изменениям"</simple>
</value>
</entry>
<entry>
<key>placeholder</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"edit_comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
</children>
<children id="405b8a64-7843-4f9c-a96e-a65ec5afde54">

146
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на изменение пользователя.page
View file

@ -156,41 +156,7 @@
<entry>
<key>elseActions</key>
<value>
<item id="46cd4a5a-ee4e-4399-9426-5aacbb856be2" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c64879eb-413b-4590-bccb-876139b24881","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="46cd4a5a-ee4e-4399-9426-5aacbb856be2" removed="true"/>
<item id="ac08d39f-2342-4471-b763-2a798f7f344a" removed="false">
<value>
<complex>
@ -412,41 +378,7 @@
<key>thenActions</key>
<value>
<item id="6a6f7cf8-b71e-4c7c-a2b7-4ed8d3a7c83f" removed="true"/>
<item id="234072de-7635-4db5-8f45-b73e59d5b948" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c64879eb-413b-4590-bccb-876139b24881","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="234072de-7635-4db5-8f45-b73e59d5b948" removed="true"/>
<item id="896fc5ac-ee75-4637-89c0-834a30fd6958" removed="false">
<value>
<complex>
@ -2219,79 +2151,7 @@
<componentRootId>c64879eb-413b-4590-bccb-876139b24881</componentRootId>
<name>Примечание по изменениям</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="aedd85c8-33a7-46fa-af8e-fdd4ef16a933" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>disabled</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>inheritParent</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"Примечание по изменениям"</simple>
</value>
</entry>
<entry>
<key>placeholder</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"edit_comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
</children>
<children id="405b8a64-7843-4f9c-a96e-a65ec5afde54">

223
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
View file

@ -5552,73 +5552,7 @@
<componentRootId>2af8ef48-dd3c-415f-bbda-3eda03f71b8e</componentRootId>
<name>Примечание</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="aedd85c8-33a7-46fa-af8e-fdd4ef16a933" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>inheritParent</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"Примечание"</simple>
</value>
</entry>
<entry>
<key>placeholder</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"edit_comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="f116b685-857e-432f-b6be-9b0fc3490c27">
<prototypeId>5ebd2885-0972-4e51-8376-1fa66aed9a90</prototypeId>
@ -10005,79 +9939,7 @@
<componentRootId>75ef07aa-7a56-4704-9614-4d31e7866bec</componentRootId>
<name>Примечание</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="aedd85c8-33a7-46fa-af8e-fdd4ef16a933" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>inheritParent</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"Примечание"</simple>
</value>
</entry>
<entry>
<key>placeholder</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"edit_comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="e62a6b9a-b49a-4ebd-a03d-3cd9a037683a">
<prototypeId>5ebd2885-0972-4e51-8376-1fa66aed9a90</prototypeId>
@ -10369,7 +10231,6 @@
<componentRootId>d869cc8e-fe9d-44d3-b6dd-6735f31c449e</componentRootId>
<name>Vbox_3</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -10409,6 +10270,7 @@
<componentRootId>3a51ef9f-b79f-4a8f-9ed3-36e6a08f9710</componentRootId>
<name>Many to many</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -10959,6 +10821,7 @@
<componentRootId>becd2004-4e2b-48a5-a037-ad78e195dff8</componentRootId>
<name>IP-адреса</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="e39e7bd9-3f44-4cb6-ab26-7aa5f7e7e1cc">
<properties>
@ -11756,13 +11619,6 @@
</properties>
</scripts>
</children>
<children id="beaadd76-074c-4c2e-969e-31c81269922c">
<prototypeId>05ed2031-091f-4fe0-8844-067ac42155aa</prototypeId>
<componentRootId>beaadd76-074c-4c2e-969e-31c81269922c</componentRootId>
<name>Validation controller_подгрузка</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="ced6af81-8f9b-40ff-b15b-78c523d99d19">
<prototypeId>f9a38417-9ad0-412a-9b5f-bbeb450dddd6</prototypeId>
<componentRootId>ced6af81-8f9b-40ff-b15b-78c523d99d19</componentRootId>
@ -12338,6 +12194,7 @@
<componentRootId>4d93067f-dec5-48e5-9d24-6adf11566788</componentRootId>
<name>Form3_load</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -13363,6 +13220,7 @@
<componentRootId>843c0d5d-0f39-488c-a073-8df5f3335e37</componentRootId>
<name>Vbox_1-2</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -14087,67 +13945,7 @@
<componentRootId>e81745b5-c1d1-4ecc-8ea0-5b11cd55ae5c</componentRootId>
<name>Примечание</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="aedd85c8-33a7-46fa-af8e-fdd4ef16a933" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>inheritParent</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"Примечание"</simple>
</value>
</entry>
<entry>
<key>placeholder</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"edit_comment"}</simple>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="d2e6a4dd-0e3f-43dc-b203-de7f76104da0">
<prototypeId>5ebd2885-0972-4e51-8376-1fa66aed9a90</prototypeId>
@ -15963,13 +15761,6 @@
</properties>
</scripts>
</children>
<children id="e8772e4c-02f8-4552-ba2f-f85069afec32">
<prototypeId>05ed2031-091f-4fe0-8844-067ac42155aa</prototypeId>
<componentRootId>e8772e4c-02f8-4552-ba2f-f85069afec32</componentRootId>
<name>Validation controller_подгрузка</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="edae8d46-1ce2-4551-b888-c23e94f70ad1">
<prototypeId>f9a38417-9ad0-412a-9b5f-bbeb450dddd6</prototypeId>
<componentRootId>edae8d46-1ce2-4551-b888-c23e94f70ad1</componentRootId>