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

Merge branch 'dev' into test

Browse source
This commit is contained in:
Булат Хайруллин 2025-01-14 16:33:44 +03:00
commit 4f22d453fc
8 changed files with 480 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.yaml
View file

@ -47,7 +47,7 @@ ingress:
labels:
app/name: account-applications
rules:
- host: 'aa-ervu-test.pgs.rtlabs.ru'
- host: 'aa-ervu-dev.pgs.rtlabs.ru'
http:
paths:
- path: /

41
config/nginx.conf
View file

@ -75,16 +75,41 @@ http {
text/xml;
location / {
root /frontend;
index index.html;
expires -1;
try_files $uri $uri/ $uri/index.html;
root /frontend;
index index.html;
try_files $uri @index;
#Application config
location = /src/resources/app-config.json {
add_header Cache-Control "no-cache";
expires 0;
}
# Media: images, icons, video, audio, HTC
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ {
expires 1M;
access_log off;
# max-age must be in seconds
add_header Cache-Control "max-age=2629746, public";
}
# CSS and Javascript
location ~* \.(?:css|js)$ {
expires 1y;
access_log off;
add_header Cache-Control "max-age=31556952, public";
}
}
location @index {
root /frontend;
add_header Cache-Control "no-cache";
expires 0;
try_files /index.html =404;
}
location = /health {
access_log off;
add_header 'Content-Type' 'application/json';
return 200 '{"status":"UP"}';
access_log off;
add_header 'Content-Type' 'application/json';
return 200 '{"status":"UP"}';
}
}
}
}

32
resources/src/main/resources/business-model/user_accounts.jrxml
View file

@ -19,44 +19,20 @@
<parameter name="user_account_id_array" class="java.lang.String"/>
<queryString>
<![CDATA[select
luaug1.user_application_list_id,
addinfo.user_application_list_id,
addinfo.secondname as last_name,
addinfo.firstname as first_name,
addinfo.middlename as middle_name,
addinfo.sex,
to_char(addinfo.birth_date, 'dd.mm.yyyy') as birth_date,
addinfo.snils,
ug1.name as position,
addinfo.job_position as position,
addinfo.user_login as username,
addinfo.ip_address
from public.user_application_list addinfo
join public.link_user_application_user_group luaug1 on luaug1.user_application_list_id=addinfo.user_application_list_id
inner join security.user_group ug1 on ug1.user_group_id=luaug1.user_group_id
where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])]))
and (ug1.name ='Военный комиссар' or ug1.name ='Сотрудник ВК')
and addinfo.application_status = 'IN_PROGRESS'
where addinfo.application_status = 'IN_PROGRESS'
and addinfo.application_kind = 'CREATE_USER'
EXCEPT
select
luaug1.user_application_list_id,
addinfo.secondname as last_name,
addinfo.firstname as first_name,
addinfo.middlename as middle_name,
addinfo.sex,
to_char(addinfo.birth_date, 'dd.mm.yyyy') as birth_date,
addinfo.snils,
ug2.name as position,
addinfo.user_login as username,
addinfo.ip_address
from public.user_application_list addinfo
join public.link_user_application_user_group luaug1 on luaug1.user_application_list_id=addinfo.user_application_list_id
join security.user_group ug1 on (ug1.user_group_id=luaug1.user_group_id and ug1.name ='Военный комиссар')
join public.link_user_application_user_group luaug2 on luaug2.user_application_list_id=addinfo.user_application_list_id
join security.user_group ug2 on (ug2.user_group_id=luaug2.user_group_id and ug2.name ='Сотрудник ВК')
where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])]))
and (luaug1.user_application_list_id = luaug2.user_application_list_id)
and addinfo.application_status = 'IN_PROGRESS'
and addinfo.application_kind = 'CREATE_USER']]>
]]>
</queryString>
<field name="user_application_list_id" class="java.lang.Long">
<property name="com.jaspersoft.studio.field.label" value="user_application_list_id"/>

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

@ -1204,6 +1204,169 @@
</complex>
</value>
</item>
<item id="09d5c116-dbac-4817-a43d-a1273df74f31" removed="true"/>
</value>
</entry>
</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>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="1a590440-bd87-4a5d-aab3-8f718a179ec5" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"80f94647-9cb4-4aaf-8c6b-a842e486e98c","packageName":"component.container","className":"Form","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"formLoaded"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="c7e8f8f5-8e89-4248-b68b-e1d1afec4cdd" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"REJECT"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"CONTAINS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="2df62804-cc90-49e8-9c59-8697c8f1eec2" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"AND"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="6a6f7cf8-b71e-4c7c-a2b7-4ed8d3a7c83f" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"90961d84-b7e6-4b18-b51f-1cc07d2acf09","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="b4e369c2-515c-494b-930e-5097408cb0ff" removed="true"/>
<item id="09d5c116-dbac-4817-a43d-a1273df74f31" removed="true"/>
</value>
</entry>
@ -1216,6 +1379,7 @@
<componentRootId>a68c745b-dad9-4eb3-99fb-34c1554f21c3</componentRootId>
<name>Vbox_15%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1283,6 +1447,7 @@
<componentRootId>e5495276-f0df-408f-bb86-4cfb4cf21f20</componentRootId>
<name>hidden</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1910,7 +2075,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"user_application_document","schemaName":"public","x":395.0,"y":168.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"user_application_document","schemaName":"public","x":395.0,"y":168.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_document":{"tableName":"user_application_document","schemaName":"public","x":395.0,"y":168.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"user_application_list":{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"user_application_list","refToEntityName":"user_application_document","refToColumns":[{"schema":"public","table":"user_application_document","entity":"user_application_document","name":"user_application_list_id"}],"refOnColumns":[{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"user_application_list","refToEntityName":"recruitment","refToColumns":[{"schema":"public","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null],[null,null,null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":236.0,"y":320.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"user_application_list":{"tableName":"user_application_list","schemaName":"public","x":395.0,"y":318.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"user_application_list","refToEntityName":"recruitment","refToColumns":[{"schema":"public","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -1948,16 +2113,7 @@
<name>Hbox</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>disabled</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
@ -1970,6 +2126,12 @@
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>disabled</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>style</key>
<value>
@ -2005,6 +2167,7 @@
<componentRootId>84326c0c-7215-484e-812e-dad09f8e338e</componentRootId>
<name>Vbox_1</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2679,7 +2842,7 @@
<entry>
<key>mask</key>
<value>
<simple>"999.999.9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>
@ -3029,12 +3192,6 @@
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
@ -3159,20 +3316,6 @@
<container>true</container>
<removed>true</removed>
</children>
<children id="84326c0c-7215-484e-812e-dad09f8e338e">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>84326c0c-7215-484e-812e-dad09f8e338e</componentRootId>
<name>Vbox_1</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="c49770cf-0841-433e-b355-a31ce0e22b42">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>c49770cf-0841-433e-b355-a31ce0e22b42</componentRootId>
<name>Vbox_2</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="4b6acb44-bdc9-4015-872b-238d45ce643f">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>4b6acb44-bdc9-4015-872b-238d45ce643f</componentRootId>
@ -3206,6 +3349,7 @@
<componentRootId>62adbc2d-0be1-45de-bc44-b77d11b129d7</componentRootId>
<name>Grid_groups</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
<properties>
@ -3308,6 +3452,7 @@
<componentRootId>2810edc4-dae7-4fc7-b457-5a483fee9081</componentRootId>
<name>Filter group</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="3f5f352c-1a86-4702-a914-6c163c903157">
<properties>
@ -3437,6 +3582,12 @@
<scripts id="3f5f352c-1a86-4702-a914-6c163c903157">
<properties>
<entry>
<key>loadOnStart</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
@ -3508,6 +3659,105 @@
<removed>true</removed>
</children>
</children>
<children id="de9abe54-609e-4041-9205-38e811cb4f75">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>de9abe54-609e-4041-9205-38e811cb4f75</componentRootId>
<name>Hbox</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="5348fce9-f492-4607-8096-de3655553dbd" removed="false">
<value>
<simple>"pull-right"</simple>
</value>
</item>
</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="6abea532-4ca5-4f84-9c3f-ed26c2d755f9">
<prototypeId>f4ca0e36-67d2-4882-9032-96718d6892da</prototypeId>
<componentRootId>6abea532-4ca5-4f84-9c3f-ed26c2d755f9</componentRootId>
<name>Download button</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="0914d0bf-0b79-4c30-a9df-66c5e62e2201">
<properties>
<entry>
<key>selectableComponent</key>
<value>
<simple>{"objectId":"6ee95a07-1f65-4848-afe7-b6788502fb6b","packageName":"component.grid","className":"GridV2","type":"TS"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="b4b0af21-54e4-4fd8-8d81-2540430a5925">
<properties>
<entry>
<key>downloadService</key>
<value>
<complex>
<entry>
<key>binaryColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_document","entity":"user_application_document","name":"file"}</simple>
</value>
</entry>
<entry>
<key>dao</key>
<value>
<complex>
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_document","schemaName":"public","x":246.0,"y":189.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_document","schemaName":"public","x":246.0,"y":189.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_document":{"tableName":"user_application_document","schemaName":"public","x":246.0,"y":189.0,"alias":"user_application_document","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
<entry>
<key>uniqueResult</key>
<value>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>fileNameColumn</key>
<value>
<simple>{"schema":"public","table":"user_application_document","entity":"user_application_document","name":"file_name"}</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="3f37c5bd-5806-4d6c-9aa3-2960060f9afc">
<classRef type="TS">
<className>FilterDelegate</className>
<packageName>component.chart</packageName>
</classRef>
<expanded>true</expanded>
<properties>
<entry>
<key>filterableComponents</key>
<value>
<item id="0a911196-aa8a-4c77-8ab9-7b9088774583" removed="true"/>
</value>
</entry>
</properties>
</scripts>
</children>
</children>
<children id="6ee95a07-1f65-4848-afe7-b6788502fb6b">
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
<componentRootId>6ee95a07-1f65-4848-afe7-b6788502fb6b</componentRootId>
@ -3521,6 +3771,12 @@
<key>autoStretchColumns</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>loadOnInit</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
@ -3856,6 +4112,8 @@
</complex>
</value>
</item>
<item id="f340a8d0-d911-47c4-b5e2-ced7b4c61c32" removed="true"/>
<item id="9ab8fe21-ae7f-410a-8f1e-0c7b9d9e8d78" removed="true"/>
</value>
</entry>
</properties>
@ -4252,6 +4510,7 @@
<componentRootId>17309155-1a83-4e58-b5f6-3fc377316819</componentRootId>
<name>Vbox_AC_role</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>

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

@ -1284,6 +1284,7 @@
<componentRootId>ea3759c2-1b7a-45f1-8422-d98df8e10d23</componentRootId>
<name>Vbox_2</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1476,7 +1477,13 @@
<entry>
<key>mask</key>
<value>
<simple>"999.999.9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>
<key>pattern</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
@ -1781,6 +1788,43 @@
<entry>
<key>extensionFilter</key>
<value>
<item id="f7160c24-b556-427e-8c07-40ac6309dbb5" removed="false">
<value>
<simple>"pdf"</simple>
</value>
</item>
<item id="499f71c1-272c-48a5-ab70-2cd8b80c11a7" removed="false">
<value>
<simple>"png"</simple>
</value>
</item>
<item id="2ee3d3e8-3f6e-4dbb-9c57-7815ec96dadc" removed="false">
<value>
<simple>"jpg"</simple>
</value>
</item>
<item id="d8b830a7-2e42-4639-baa9-85c73895ace5" removed="false">
<value>
<simple>"jpeg"</simple>
</value>
</item>
<item id="306d0d42-1cee-43ea-b7e4-6300ffd55158" removed="true"/>
<item id="1fee2eab-40ba-4c16-b471-75f522eeea9d" removed="true"/>
<item id="8c398d16-eac4-4f31-9755-55748bc29b65" removed="false">
<value>
<simple>"odt"</simple>
</value>
</item>
<item id="8b635611-b65a-49c5-b1f2-dc3b9975811c" removed="false">
<value>
<simple>"doc"</simple>
</value>
</item>
<item id="cb7c8457-2f6e-41a3-9a4d-e8560ddee7c3" removed="false">
<value>
<simple>"docx"</simple>
</value>
</item>
<item id="e5c31c54-9371-4c39-8c26-2ada992000d6" removed="true"/>
</value>
</entry>
@ -1847,7 +1891,7 @@
<entry>
<key>maxFilesToUpload</key>
<value>
<simple>2</simple>
<simple>5</simple>
</value>
</entry>
<entry>
@ -3814,7 +3858,6 @@
<componentRootId>f73c8f4a-f53e-472b-9dd6-8e4c704d2f6d</componentRootId>
<name>Dialog</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>

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

@ -1495,7 +1495,7 @@
<entry>
<key>mask</key>
<value>
<simple>"999.999.9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>
@ -1794,6 +1794,41 @@
<entry>
<key>extensionFilter</key>
<value>
<item id="546b4d7d-60bf-429e-8ad8-5dcc9c3766fb" removed="false">
<value>
<simple>"pdf"</simple>
</value>
</item>
<item id="3c708cf2-e04a-4aab-b9be-40188d099754" removed="false">
<value>
<simple>"png"</simple>
</value>
</item>
<item id="28fb0dab-4051-4665-bcc4-084c56b8fe91" removed="false">
<value>
<simple>"jpg"</simple>
</value>
</item>
<item id="0c6fde7f-eb20-4fdd-a875-6aed4c14fa00" removed="false">
<value>
<simple>"jpeg"</simple>
</value>
</item>
<item id="f833b28f-2182-471f-b1f1-0bdef2e87965" removed="false">
<value>
<simple>"odt"</simple>
</value>
</item>
<item id="3334bf06-d956-4834-a924-d58d38bc5481" removed="false">
<value>
<simple>"doc"</simple>
</value>
</item>
<item id="fbe7441b-cc38-438a-a6d3-484075504767" removed="false">
<value>
<simple>"docx"</simple>
</value>
</item>
<item id="e5c31c54-9371-4c39-8c26-2ada992000d6" removed="true"/>
</value>
</entry>
@ -1860,7 +1895,7 @@
<entry>
<key>maxFilesToUpload</key>
<value>
<simple>2</simple>
<simple>5</simple>
</value>
</entry>
<entry>

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

@ -1501,7 +1501,7 @@
<entry>
<key>mask</key>
<value>
<simple>"999.999.9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>
@ -1873,6 +1873,42 @@
<entry>
<key>extensionFilter</key>
<value>
<item id="869e5561-96f6-48eb-bbec-ceaca26a3d2f" removed="false">
<value>
<simple>"pdf"</simple>
</value>
</item>
<item id="65813370-dd84-4bfa-8763-7ef63c480187" removed="false">
<value>
<simple>"png"</simple>
</value>
</item>
<item id="f109d855-da45-49bd-9437-0983e9940fad" removed="false">
<value>
<simple>"jpg"</simple>
</value>
</item>
<item id="db50f5c1-7115-4b33-9cb2-494e17d03fe4" removed="false">
<value>
<simple>"jpeg"</simple>
</value>
</item>
<item id="d696350a-d40e-4a7c-9b3c-0ab2e42e0490" removed="false">
<value>
<simple>"odt"</simple>
</value>
</item>
<item id="3887112e-b9fe-4a3e-be9f-048d99ec1000" removed="false">
<value>
<simple>"doc"</simple>
</value>
</item>
<item id="7186e499-7237-4520-943c-631762846609" removed="false">
<value>
<simple>"docx"</simple>
</value>
</item>
<item id="476424e7-d37b-4d27-ba7a-0624cfe7ad39" removed="true"/>
<item id="e5c31c54-9371-4c39-8c26-2ada992000d6" removed="true"/>
</value>
</entry>
@ -1939,7 +1975,7 @@
<entry>
<key>maxFilesToUpload</key>
<value>
<simple>2</simple>
<simple>5</simple>
</value>
</entry>
<entry>

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

@ -6748,6 +6748,36 @@
</properties>
</scripts>
</children>
<children id="8983d20c-d1be-472f-b82e-2d93fd63e7c8">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>8983d20c-d1be-472f-b82e-2d93fd63e7c8</componentRootId>
<name>Примечание</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<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":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="26988b6c-2b7e-4bd5-bf22-675d46397ad2">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>26988b6c-2b7e-4bd5-bf22-675d46397ad2</componentRootId>