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

Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8957_add_set_account_action_method

Browse source
This commit is contained in:
Alexandr Shalaginov 2025-03-15 21:23:50 +03:00
commit 3e7764fcfe
26 changed files with 2659 additions and 621 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/pom.xml
View file

@ -164,14 +164,6 @@
<groupId>ru.cg.webbpm.modules.reporting.reporting-jasper</groupId>
<artifactId>reporting-jasper-runtime-impl</artifactId>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.modules.reporting.reporting-xdoc</groupId>
<artifactId>reporting-xdoc-impl</artifactId>
</dependency>
<dependency>
<groupId>ru.cg.webbpm.modules.reporting.reporting-xdoc</groupId>
<artifactId>reporting-xdoc-runtime-impl</artifactId>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>

31
backend/src/main/java/ru/micord/ervu/account_applications/component/service/AbstractIdmValidatorService.java Normal file
View file

@ -0,0 +1,31 @@
package ru.micord.ervu.account_applications.component.service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.client.RestTemplate;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
/**
* @author Emir Suleimanov
*/
public abstract class AbstractIdmValidatorService implements IdmValidatorService{
protected RestTemplate restTemplate;
protected SecurityContext securityContext;
@Value("${ervu.url}")
protected String ervuUrl;
public AbstractIdmValidatorService(RestTemplate restTemplate, SecurityContext securityContext) {
this.restTemplate = restTemplate;
this.securityContext = securityContext;
}
public HttpEntity<Void> createRequestEntity() {
HttpHeaders headers = new HttpHeaders();
headers.setBearerAuth(securityContext.getToken());
headers.setContentType(MediaType.APPLICATION_JSON);
return new HttpEntity<>(headers);
}
}

3
backend/src/main/java/ru/micord/ervu/account_applications/component/service/ErvuUserGridLoadService.java
View file

@ -85,8 +85,7 @@ public class ErvuUserGridLoadService extends Behavior implements GridService {
HttpRequest request = HttpRequest.newBuilder()
.uri(UriComponentsBuilder.fromHttpUrl(ervuUrl)
.pathSegment(PathConstant.ACCOUNTS_PATH)
.pathSegment(FILTER_PATH)
.pathSegment(PathConstant.ACCOUNTS_PATH, FILTER_PATH)
.build().toUri())
.header(HttpHeaders.CONTENT_TYPE, "application/json")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + securityContext.getToken())

20
backend/src/main/java/ru/micord/ervu/account_applications/component/service/IdmLoginValidatorService.java
View file

@ -3,38 +3,38 @@ package ru.micord.ervu.account_applications.component.service;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import ru.micord.ervu.account_applications.component.exception.IdmValidatorException;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
/**
* @author Emir Suleimanov
*/
@Service
public class IdmLoginValidatorService implements IdmValidatorService{
private final RestTemplate restTemplate;
public class IdmLoginValidatorService extends AbstractIdmValidatorService{
@Value("${ervu.url}")
private String ervuUrl;
public IdmLoginValidatorService(RestTemplate restTemplate) {
this.restTemplate = restTemplate;
public IdmLoginValidatorService(RestTemplate restTemplate, SecurityContext securityContext) {
super(restTemplate, securityContext);
}
@Override
public boolean valueExists(String login) {
String url = String.format("%s/service/idm/credentials/login/%s", ervuUrl, login);
HttpEntity<Void> entity = createRequestEntity();
try {
ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
url, HttpMethod.GET, null, new ParameterizedTypeReference<>() {}
url, HttpMethod.GET, entity, new ParameterizedTypeReference<>() {}
);
return response.getBody() != null &&
response.getBody().stream()
.anyMatch(user -> login.equals(user.get("userName")));
} catch (Exception e) {
}
catch (Exception e) {
throw new IdmValidatorException("Ошибка при проверке логина: " + login, e);
}
}

34
backend/src/main/java/ru/micord/ervu/account_applications/component/service/IdmSnilsValidatorService.java
View file

@ -1,45 +1,43 @@
package ru.micord.ervu.account_applications.component.service;
import java.util.Objects;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import ru.micord.ervu.account_applications.component.exception.IdmValidatorException;
import ru.micord.ervu.account_applications.component.model.dto.IdmPersonsResponse;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
/**
* @author Emir Suleimanov
*/
@Service
public class IdmSnilsValidatorService implements IdmValidatorService {
private final RestTemplate restTemplate;
public class IdmSnilsValidatorService extends AbstractIdmValidatorService {
@Value("${ervu.url}")
private String ervuUrl;
public IdmSnilsValidatorService(RestTemplate restTemplate) {
this.restTemplate = restTemplate;
public IdmSnilsValidatorService(RestTemplate restTemplate, SecurityContext securityContext) {
super(restTemplate, securityContext);
}
@Override
public boolean valueExists(String snils) {
String url = String.format("%s/service/idm/persons?query=snils==\"%s\"", ervuUrl, snils);
HttpEntity<Void> entity = createRequestEntity();
try {
ResponseEntity<IdmPersonsResponse> response = restTemplate.exchange(
url, HttpMethod.GET, null, new ParameterizedTypeReference<>() {}
url, HttpMethod.GET, entity, new ParameterizedTypeReference<>() {}
);
IdmPersonsResponse records = response.getBody();
if (Objects.nonNull(records)) {
return Optional.ofNullable(records.getRecords())
.map(record -> record.stream().anyMatch(value -> snils.equals(value.get("snils"))))
.orElse(false);
}
return false;
} catch (Exception e) {
return Optional.ofNullable(response.getBody())
.map(IdmPersonsResponse::getRecords)
.stream()
.flatMap(List::stream)
.anyMatch(value -> snils.equals(value.get("snils")));
}
catch (Exception e) {
throw new IdmValidatorException("Ошибка при проверке СНИЛС: " + snils, e);
}
}

26
backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java
View file

@ -13,10 +13,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
@ -38,6 +35,10 @@ import ru.micord.ervu.account_applications.dto.edit.EditData;
import ru.micord.ervu.account_applications.dto.edit.EditRolesDto;
import ru.micord.ervu.account_applications.dto.edit.EditPersonDto;
import ru.micord.ervu.account_applications.dto.edit.EditPersonProcessRequest;
import ru.micord.ervu.account_applications.dto.password.ResetPasswordData;
import ru.micord.ervu.account_applications.dto.password.ResetPasswordDto;
import ru.micord.ervu.account_applications.dto.password.ResetPasswordProcessRequest;
import ru.micord.ervu.account_applications.dto.password.UserIdInfo;
import ru.micord.ervu.account_applications.enums.ProcessKey;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
import ru.micord.ervu.account_applications.service.UserApplicationListService;
@ -116,6 +117,23 @@ public class AdminController {
return doRequestAndSaveTraceId(request, data.appNumber());
}
@GetMapping("/exists")
public ResponseEntity<Boolean> userExists(@RequestParam(name = "login") String login) {
boolean result = applicationListService.userExists(login);
return ResponseEntity.ok(result);
}
@PostMapping(value = "/password/reset")
public ResponseEntity<?> resetPassword(@RequestBody @Valid ResetPasswordDto dto) {
UserIdInfo userIdInfo = new UserIdInfo(dto.accountId());
ResetPasswordData resetPasswordData = new ResetPasswordData(userIdInfo);
ResetPasswordProcessRequest request = new ResetPasswordProcessRequest(
ProcessKey.RESET_PASSWORD.getValue(),
getUserId(), resetPasswordData
);
return doRequestAndSaveTraceId(request, dto.appNumber());
}
private <R> ResponseEntity<?> doRequestAndSaveTraceId(ProcessRequest<R> request, long appNumber) {
ResponseEntity<?> responseEntity = doRequest(request);

11
backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java
View file

@ -1,5 +1,9 @@
package ru.micord.ervu.account_applications.dao;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Optional;
import org.jooq.DSLContext;
import org.springframework.stereotype.Repository;
import ru.micord.ervu.account_applications.enums.ApplicationStatus;
@ -47,4 +51,11 @@ public class UserApplicationListDao {
.where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId))
.execute();
}
public boolean userExists(String login) {
return dslContext.fetchExists(
dslContext.selectOne()
.from(USER_APPLICATION_LIST)
.where(USER_APPLICATION_LIST.USER_LOGIN.eq(login)));
}
}

8
backend/src/main/java/ru/micord/ervu/account_applications/dto/password/ResetPasswordData.java Normal file
View file

@ -0,0 +1,8 @@
package ru.micord.ervu.account_applications.dto.password;
/**
* @author Adel Kalimullin
*/
public record ResetPasswordData(UserIdInfo account) {
}

13
backend/src/main/java/ru/micord/ervu/account_applications/dto/password/ResetPasswordDto.java Normal file
View file

@ -0,0 +1,13 @@
package ru.micord.ervu.account_applications.dto.password;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* @author Adel Kalimullin
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public record ResetPasswordDto(@NotNull long appNumber, @NotNull @NotEmpty String accountId) {
}

13
backend/src/main/java/ru/micord/ervu/account_applications/dto/password/ResetPasswordProcessRequest.java Normal file
View file

@ -0,0 +1,13 @@
package ru.micord.ervu.account_applications.dto.password;
import ru.micord.ervu.account_applications.dto.ProcessRequest;
/**
* @author Adel Kalimullin
*/
public class ResetPasswordProcessRequest extends ProcessRequest {
public ResetPasswordProcessRequest(String processKey, String userId, Object data) {
super(processKey, userId, data);
}
}

7
backend/src/main/java/ru/micord/ervu/account_applications/dto/password/UserIdInfo.java Normal file
View file

@ -0,0 +1,7 @@
package ru.micord.ervu.account_applications.dto.password;
/**
* @author Adel Kalimullin
*/
public record UserIdInfo(String id){
}

3
backend/src/main/java/ru/micord/ervu/account_applications/enums/ProcessKey.java
View file

@ -8,7 +8,8 @@ public enum ProcessKey {
EDIT_PERSON("milBaseEditAccountPersonIDMProcess"),
EDIT_ACCOUNT("milBaseEditAccountIDMProcess"),
EDIT_ROLES("milBaseEditAccountRolesIDMSubProcess"),
DEACTIVATE("milBaseMassDeActivateAccountIDMProcess");
DEACTIVATE("milBaseMassDeActivateAccountIDMProcess"),
RESET_PASSWORD("milBaseResetPasswordProcess");
private final String value;

9
backend/src/main/java/ru/micord/ervu/account_applications/security/filter/JwtAuthenticationFilter.java
View file

@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
@ -43,9 +44,13 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
try {
Authentication authentication = attemptAuthentication(request);
if (authentication != null) {
SecurityContextHolder.getContext().setAuthentication(authentication);
SecurityContext context = SecurityContextHolder.getContext();
context.setAuthentication(authentication);
//TODO SUPPORT-9009 connection by duty user
new Thread(webSocketService::connectToSocket).start();
new Thread(() -> {
SecurityContextHolder.setContext(context);
webSocketService.connectToSocket();
}).start();
}
}
catch (AuthenticationException e) {

2
backend/src/main/java/ru/micord/ervu/account_applications/service/AccountServiceImpl.java
View file

@ -37,7 +37,7 @@ public class AccountServiceImpl extends AbstractUserDataService {
private Account fetchAccountById(Object id) throws IOException, InterruptedException {
String url = UriComponentsBuilder.fromHttpUrl(ervuUrl)
.pathSegment(PathConstant.ACCOUNTS_PATH)
.path(PathConstant.ACCOUNTS_PATH)
.pathSegment(id.toString())
.queryParam("expand", "person,user-domain,region")
.toUriString();

5
backend/src/main/java/ru/micord/ervu/account_applications/service/RoleServiceImpl.java
View file

@ -35,9 +35,8 @@ public class RoleServiceImpl extends AbstractUserDataService {
private List<Role> fetchRolesByAccountId(Object accountId) throws IOException, InterruptedException {
String url = UriComponentsBuilder.fromHttpUrl(ervuUrl)
.pathSegment(PathConstant.ACCOUNTS_PATH)
.pathSegment(accountId.toString())
.pathSegment(ROLES)
.path(PathConstant.ACCOUNTS_PATH)
.pathSegment(accountId.toString(), ROLES)
.toUriString();
HttpResponse<String> response = sendGetRequest(url);

5
backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java
View file

@ -1,5 +1,6 @@
package ru.micord.ervu.account_applications.service;
import org.springframework.stereotype.Service;
import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
@ -23,6 +24,10 @@ public class UserApplicationListService {
dao.savePassword(traceId, encodedPass);
}
public boolean userExists(String login){
return dao.userExists(login);
}
public void saveAcceptedStatus(String traceId) {
dao.saveAcceptedStatus(traceId);
}

8
backend/src/main/java/ru/micord/ervu/account_applications/service/UserCredentialsServiceIpml.java
View file

@ -2,15 +2,12 @@ package ru.micord.ervu.account_applications.service;
import java.io.IOException;
import java.net.http.HttpResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.CollectionType;
import model.grid.GridRow;
import model.grid.GridRows;
import org.springframework.stereotype.Service;
import org.springframework.web.util.UriComponentsBuilder;
import ru.micord.ervu.account_applications.component.model.Credential;
@ -36,9 +33,8 @@ public class UserCredentialsServiceIpml extends AbstractUserDataService {
private List<Credential> fetchCredentialsByPersonId(Object personId) throws IOException, InterruptedException {
String url = UriComponentsBuilder.fromHttpUrl(ervuUrl)
.pathSegment(PathConstant.PERSONS_PATH)
.pathSegment(personId.toString())
.pathSegment(CREDENTIALS)
.path(PathConstant.PERSONS_PATH)
.pathSegment(personId.toString(), CREDENTIALS)
.toUriString();
HttpResponse<String> response = sendGetRequest(url);

6
backend/src/main/java/ru/micord/ervu/account_applications/websocket/handler/ClientSocketHandler.java
View file

@ -46,7 +46,6 @@ public class ClientSocketHandler extends TextWebSocketHandler {
@Override
public void afterConnectionEstablished(WebSocketSession session) {
LOGGER.info("established connection {}", session);
sessionByUserId.put(securityContext.getUserId(), session);
}
@Override
@ -100,11 +99,14 @@ public class ClientSocketHandler extends TextWebSocketHandler {
LOGGER.error("Failed to close session on afterConnectionClosed ", e);
}
}
sessionByUserId.remove(securityContext.getUserId());
webSocketService.connectToSocket();
}
public boolean isSessionOpen(String userId) {
return sessionByUserId.get(userId) != null && sessionByUserId.get(userId).isOpen();
}
public void putSession(String userId, WebSocketSession session) {
sessionByUserId.put(userId, session);
}
}

8
backend/src/main/java/ru/micord/ervu/account_applications/websocket/service/WebSocketService.java
View file

@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketHttpHeaders;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.client.WebSocketClient;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
import ru.micord.ervu.account_applications.websocket.handler.ClientSocketHandler;
@ -42,7 +43,9 @@ public class WebSocketService {
}
public void connectToSocket() {
if (((ClientSocketHandler) webSocketHandler).isSessionOpen(securityContext.getUserId())) {
ClientSocketHandler socketHandler = (ClientSocketHandler) this.webSocketHandler;
if (socketHandler.isSessionOpen(securityContext.getUserId())) {
return;
}
WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
@ -53,8 +56,9 @@ public class WebSocketService {
try {
String host = new URI(ervuUrl).getHost();
webSocketClient.doHandshake(webSocketHandler, headers,
WebSocketSession session = webSocketClient.doHandshake(this.webSocketHandler, headers,
URI.create("wss://" + host + socketQueue)).get(timeout, TimeUnit.SECONDS);
socketHandler.putSession(securityContext.getUserId(), session);
}
catch (InterruptedException | ExecutionException | URISyntaxException | TimeoutException e) {
LOGGER.error("Failed to connect socket", e);

3
frontend/src/ts/account_applications/component/button/UserManagementService.ts
View file

@ -57,6 +57,9 @@ export class UserManagementService extends Behavior {
case AccountAction.DEACTIVATE:
this.doRequest("users/deactivation", jsonObj);
break;
case AccountAction.RESET_PASSWORD:
this.doRequest("user/password/reset", jsonObj);
break;
}
}
}

3
frontend/src/ts/account_applications/component/enum/AccountAction.ts
View file

@ -1,5 +1,6 @@
export enum AccountAction {
CREATE = "CREATE",
EDIT = "EDIT",
DEACTIVATE = "DEACTIVATE"
DEACTIVATE = "DEACTIVATE",
RESET_PASSWORD="RESET_PASSWORD"
}

27
frontend/src/ts/account_applications/component/field/FieldChecker.ts Normal file
View file

@ -0,0 +1,27 @@
import {AnalyticalScope, Behavior, Control, ControlWithValue, Visible,} from "@webbpm/base-package";
import {HttpClient} from "@angular/common/http";
@AnalyticalScope(Control)
export class FieldChecker extends Behavior {
private client: HttpClient;
private control: ControlWithValue;
initialize() {
this.client = this.injector.get(HttpClient);
this.control = this.getScript('component.ControlWithValue');
}
@Visible()
userExists(login: string) {
return this.client.get<boolean>(`user/exists?login=${encodeURIComponent(login)}`)
.toPromise()
.then((exists: boolean) => {
this.control.setValue(exists);
})
.catch((error) => {
console.error("Ошибка при проверке пользователя:", error);
this.control.setValue(null);
});
}
}

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

@ -809,6 +809,7 @@
<componentRootId>ff2fba56-3368-4d18-b0ec-155fcbd21e77</componentRootId>
<name>Form1_load</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2266,56 +2267,7 @@
</complex>
</value>
</item>
<item id="443b447a-eaa6-4461-aad2-aae638846c9d" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"5cce7e30-858d-489f-8b46-6e0f8dfc9a22","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</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":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="443b447a-eaa6-4461-aad2-aae638846c9d" removed="true"/>
<item id="16213aca-cfc6-43fa-8053-ff4d7ce1e1a8" removed="false">
<value>
<complex>
@ -2616,6 +2568,7 @@
</complex>
</value>
</item>
<item id="45ddcb83-6b55-462c-9adf-038f195d757c" removed="true"/>
<item id="fb1d291a-d470-4c41-b2cc-2cac0768deed" removed="true"/>
<item id="fb73cdd1-5d5e-4554-850b-7e248b7975e3" removed="true"/>
<item id="8c8801f7-e238-453a-8c6d-53e82fc4bf0c" removed="true"/>
@ -2690,6 +2643,542 @@
</value>
</entry>
</properties>
</scripts>
</children>
<children id="135b28a8-2c13-4c12-b597-52e8cbd40d3c">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>135b28a8-2c13-4c12-b597-52e8cbd40d3c</componentRootId>
<name>AC_copy_form1_sex</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="dcdbe44a-7cab-491c-9912-53fe0a257208" removed="true"/>
<item id="293e4fd9-09e0-48ba-b84d-de6f84d8ed1e" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="147e884a-e60e-420c-ace8-a58e70be5736" 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":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","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>"Мужской"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="93257e1a-6d36-4e65-947d-63375c94db29" 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":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","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>"MALE"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="52f561df-6de4-4dae-9faf-d592ed8ca085" removed="true"/>
<item id="906d49e1-d590-4cf0-be94-7379fed98513" removed="true"/>
<item id="b2d73532-2736-427e-aa9a-8df6c4440f3e" removed="true"/>
<item id="49dff1fb-e22c-4ef4-9eee-4af7ed8e958f" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"OR"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="5d24f972-b663-4197-a764-2084bda19756" removed="true"/>
<item id="f89b7b86-1c16-4e43-ac85-97f3d1325870" removed="true"/>
<item id="5fdce8dd-1766-4c0b-93d8-a9aa8dbb101b" removed="true"/>
<item id="8492af2a-5e39-44ce-acdc-aa6345558f50" removed="true"/>
<item id="443b447a-eaa6-4461-aad2-aae638846c9d" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"5cce7e30-858d-489f-8b46-6e0f8dfc9a22","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"MALE"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="16213aca-cfc6-43fa-8053-ff4d7ce1e1a8" removed="true"/>
<item id="5311d785-84ea-4f53-8f65-4643e2d1ab2f" removed="true"/>
<item id="79b26e40-1d5b-4a2a-b916-cdb68f4f9447" removed="true"/>
<item id="6c9c733c-2034-4a05-a198-0d2cc98f833e" removed="true"/>
<item id="6f18f0f2-33ed-456a-b5b5-b575e4117adc" removed="true"/>
<item id="b6917279-3f5b-4e9a-ac13-0147f9280d10" removed="true"/>
<item id="fb1d291a-d470-4c41-b2cc-2cac0768deed" removed="true"/>
<item id="fb73cdd1-5d5e-4554-850b-7e248b7975e3" removed="true"/>
<item id="8c8801f7-e238-453a-8c6d-53e82fc4bf0c" removed="true"/>
<item id="925999b6-c87a-401f-975d-27397e961731" removed="true"/>
<item id="be9b426c-a244-48d7-b709-29b6f09bd757" removed="true"/>
<item id="77325e02-5bc9-420d-97c9-19a7514e0fc2" removed="true"/>
<item id="19116b8a-16b5-4d16-a4a2-4d87516823c1" removed="true"/>
<item id="1c65b374-e152-4ec9-81a7-8760f50b1648" removed="true"/>
<item id="883be744-2e7f-411d-b9a1-26d2fe39fdea" removed="true"/>
<item id="3298d2bd-54f4-406d-a1ce-895af565d845" removed="true"/>
<item id="8851e763-7432-4e04-a154-d17ff1811a69" removed="true"/>
<item id="3b0f4250-3f5b-4da7-b589-73275aaf29db" removed="true"/>
<item id="e49615d0-9afb-4a16-a6d7-2be9b8efb783" removed="true"/>
<item id="f3433da7-4692-4c3c-acc0-5ce52d4fc550" removed="true"/>
<item id="62ac1277-a5a6-42ee-b8cf-0c58c3c72705" removed="true"/>
<item id="91dddd2a-030b-4cad-bb40-5b75ce15d20c" removed="true"/>
<item id="ca1889eb-99a2-4ca6-b5c0-a8e37683c8d8" removed="true"/>
<item id="e6361101-ed7c-49a9-94e4-c1e129a3c2b1" removed="true"/>
<item id="fb6c2388-be2c-4906-a75a-3f43d362553d" removed="true"/>
<item id="2bb29e1f-5905-430b-a599-de87dde06fd2" removed="true"/>
<item id="26be3f97-8cc8-4a0b-b310-28eb79fe972d" removed="true"/>
<item id="19cfd82e-53bc-420c-9e95-5e439e3f7abf" removed="true"/>
<item id="dac950be-c64b-4b3a-843e-3514035baeda" removed="true"/>
<item id="c0075968-a913-47da-bbff-914ffa88d40e" removed="true"/>
<item id="16432d51-12af-41b8-8f00-b40d88bd1de3" removed="true"/>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="bddcfb24-479e-4219-9a4b-fcce90a2d1d1">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>bddcfb24-479e-4219-9a4b-fcce90a2d1d1</componentRootId>
<name>AC_copy_form1_sex</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="dcdbe44a-7cab-491c-9912-53fe0a257208" removed="true"/>
<item id="293e4fd9-09e0-48ba-b84d-de6f84d8ed1e" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="147e884a-e60e-420c-ace8-a58e70be5736" 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":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","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>"Женский"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="93257e1a-6d36-4e65-947d-63375c94db29" 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":"981f9ebc-cf0e-4f28-916e-d78b6309dcb6","packageName":"component.field","className":"StaticComboBox","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>"FEMALE"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="52f561df-6de4-4dae-9faf-d592ed8ca085" removed="true"/>
<item id="906d49e1-d590-4cf0-be94-7379fed98513" removed="true"/>
<item id="b2d73532-2736-427e-aa9a-8df6c4440f3e" removed="true"/>
<item id="49dff1fb-e22c-4ef4-9eee-4af7ed8e958f" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"OR"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="5d24f972-b663-4197-a764-2084bda19756" removed="true"/>
<item id="f89b7b86-1c16-4e43-ac85-97f3d1325870" removed="true"/>
<item id="5fdce8dd-1766-4c0b-93d8-a9aa8dbb101b" removed="true"/>
<item id="8492af2a-5e39-44ce-acdc-aa6345558f50" removed="true"/>
<item id="443b447a-eaa6-4461-aad2-aae638846c9d" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"5cce7e30-858d-489f-8b46-6e0f8dfc9a22","packageName":"component.field","className":"StaticComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"FEMALE"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="16213aca-cfc6-43fa-8053-ff4d7ce1e1a8" removed="true"/>
<item id="5311d785-84ea-4f53-8f65-4643e2d1ab2f" removed="true"/>
<item id="79b26e40-1d5b-4a2a-b916-cdb68f4f9447" removed="true"/>
<item id="6c9c733c-2034-4a05-a198-0d2cc98f833e" removed="true"/>
<item id="6f18f0f2-33ed-456a-b5b5-b575e4117adc" removed="true"/>
<item id="b6917279-3f5b-4e9a-ac13-0147f9280d10" removed="true"/>
<item id="fb1d291a-d470-4c41-b2cc-2cac0768deed" removed="true"/>
<item id="fb73cdd1-5d5e-4554-850b-7e248b7975e3" removed="true"/>
<item id="8c8801f7-e238-453a-8c6d-53e82fc4bf0c" removed="true"/>
<item id="925999b6-c87a-401f-975d-27397e961731" removed="true"/>
<item id="be9b426c-a244-48d7-b709-29b6f09bd757" removed="true"/>
<item id="77325e02-5bc9-420d-97c9-19a7514e0fc2" removed="true"/>
<item id="19116b8a-16b5-4d16-a4a2-4d87516823c1" removed="true"/>
<item id="1c65b374-e152-4ec9-81a7-8760f50b1648" removed="true"/>
<item id="883be744-2e7f-411d-b9a1-26d2fe39fdea" removed="true"/>
<item id="3298d2bd-54f4-406d-a1ce-895af565d845" removed="true"/>
<item id="8851e763-7432-4e04-a154-d17ff1811a69" removed="true"/>
<item id="3b0f4250-3f5b-4da7-b589-73275aaf29db" removed="true"/>
<item id="e49615d0-9afb-4a16-a6d7-2be9b8efb783" removed="true"/>
<item id="f3433da7-4692-4c3c-acc0-5ce52d4fc550" removed="true"/>
<item id="62ac1277-a5a6-42ee-b8cf-0c58c3c72705" removed="true"/>
<item id="91dddd2a-030b-4cad-bb40-5b75ce15d20c" removed="true"/>
<item id="ca1889eb-99a2-4ca6-b5c0-a8e37683c8d8" removed="true"/>
<item id="e6361101-ed7c-49a9-94e4-c1e129a3c2b1" removed="true"/>
<item id="fb6c2388-be2c-4906-a75a-3f43d362553d" removed="true"/>
<item id="2bb29e1f-5905-430b-a599-de87dde06fd2" removed="true"/>
<item id="26be3f97-8cc8-4a0b-b310-28eb79fe972d" removed="true"/>
<item id="19cfd82e-53bc-420c-9e95-5e439e3f7abf" removed="true"/>
<item id="dac950be-c64b-4b3a-843e-3514035baeda" removed="true"/>
<item id="c0075968-a913-47da-bbff-914ffa88d40e" removed="true"/>
<item id="16432d51-12af-41b8-8f00-b40d88bd1de3" removed="true"/>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="d3196840-53cf-41ab-b00c-678cbf9032ad">
@ -3913,7 +4402,7 @@
<children id="f00f4780-57be-4520-9cc2-8cc2105ffbe6">
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
<componentRootId>f00f4780-57be-4520-9cc2-8cc2105ffbe6</componentRootId>
<name>Grid_roles</name>
<name>Grid_roles 1</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
@ -4184,13 +4673,13 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"074037a1-0f3d-4b39-8a9b-1302994a9f3a","packageName":"component.container","className":"Form","type":"TS"}</simple>
<simple>{"objectId":"1f82b9ee-e219-4ca4-b541-69c0f0c175e3","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"formLoaded"</simple>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
@ -4202,6 +4691,62 @@
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="4e4d5bd8-34ce-48c8-9353-ea259e89b24e" 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":"1f82b9ee-e219-4ca4-b541-69c0f0c175e3","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>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
@ -4214,6 +4759,31 @@
<entry>
<key>thenActions</key>
<value>
<item id="312f0570-ae54-434b-b1e5-76cd82d1a101" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"f00f4780-57be-4520-9cc2-8cc2105ffbe6","packageName":"account_applications.component.grid","className":"ErvuStaticGrid","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"selectAll"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="16313ba0-24bb-42f9-95d4-9e67e45747fe" removed="true"/>
<item id="1e7f0cde-3c59-4f4f-a69b-3037006bc0fe" removed="true"/>
</value>
</entry>
@ -6189,11 +6759,10 @@
<children id="a60d7c99-5fc9-4b96-b966-215d6a4fb888">
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
<componentRootId>a60d7c99-5fc9-4b96-b966-215d6a4fb888</componentRootId>
<name>Grid_roles</name>
<name>Grid_roles 2</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
<enabled>false</enabled>
<properties>
<entry>
<key>autoStretchColumns</key>
@ -6226,6 +6795,12 @@
</value>
</entry>
<entry>
<key>parentControl</key>
<value>
<simple>{"objectId":"f00f4780-57be-4520-9cc2-8cc2105ffbe6","packageName":"component.grid","className":"GridV2","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>rowModelType</key>
<value>
<simple>"CLIENT_SIDE"</simple>
@ -6251,11 +6826,27 @@
<entry>
<key>gridService</key>
<value>
<expanded>false</expanded>
<implRef type="JAVA">
<className>ErvuUserGridLoadService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
<complex>
<entry>
<key>dependencyLink</key>
<value>
<simple>{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"user_role_id"}</simple>
</value>
</entry>
<entry>
<key>loadDao</key>
<value>
<complex>
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_role","schemaName":"public","x":213.0,"y":286.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"user_application_list","schemaName":"public","x":210.0,"y":56.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"link_user_application_user_application_role","schemaName":"public","x":210.0,"y":166.0,"alias":"link_user_application_user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_role","schemaName":"public","x":213.0,"y":286.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"user_application_list","schemaName":"public","x":210.0,"y":56.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"link_user_application_user_application_role","schemaName":"public","x":210.0,"y":166.0,"alias":"link_user_application_user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_role":{"tableName":"user_application_role","schemaName":"public","x":213.0,"y":286.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"link_user_application_user_application_role":{"tableName":"link_user_application_user_application_role","schemaName":"public","x":210.0,"y":166.0,"alias":"link_user_application_user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"user_application_list":{"tableName":"user_application_list","schemaName":"public","x":210.0,"y":56.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null,null],[null,null,null],[{"refOnEntityName":"link_user_application_user_application_role","refToEntityName":"user_application_role","refToColumns":[{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"user_role_id"}],"refOnColumns":[{"schema":"public","table":"link_user_application_user_application_role","entity":"link_user_application_user_application_role","name":"user_role_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"link_user_application_user_application_role","refToEntityName":"user_application_list","refToColumns":[{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_id"}],"refOnColumns":[{"schema":"public","table":"link_user_application_user_application_role","entity":"link_user_application_user_application_role","name":"user_application_list_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1}</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
@ -6266,7 +6857,6 @@
<className>ErvuStaticGrid</className>
<packageName>account_applications.component.grid</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
@ -6282,6 +6872,12 @@
</value>
</entry>
<entry>
<key>parentControl</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>rowModelType</key>
<value>
<simple>"CLIENT_SIDE"</simple>
@ -6316,21 +6912,23 @@
<componentRootId>1598c9c6-992a-480d-8bc6-013b063702a8</componentRootId>
<name>StaticColumn</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="c7ef8bd2-65a3-4bb3-9af6-56934dce2597">
<prototypeId>d4f69cb0-864e-4895-b6fd-152072774909</prototypeId>
<componentRootId>c7ef8bd2-65a3-4bb3-9af6-56934dce2597</componentRootId>
<name>StaticColumn</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="23944c27-37e1-426f-bdc8-e8220e84f287">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>23944c27-37e1-426f-bdc8-e8220e84f287</componentRootId>
<name>Column</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="bc6afb28-7884-477d-b425-2c2001be8379">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>DefaultValueFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="a930059f-1e14-40ed-a4de-3dec3d03f9a7">
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>displayName</key>
@ -6339,109 +6937,20 @@
</value>
</entry>
<entry>
<key>field</key>
<key>displayType</key>
<value>
<complex>
<entry>
<key>column</key>
<value>
<simple>"displayName"</simple>
</value>
</entry>
<entry>
<key>filterType</key>
<value>
<simple>"TEXT"</simple>
</value>
</entry>
<entry>
<key>type</key>
<value>
<simple>"java.lang.String"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>sortable</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="c7ef8bd2-65a3-4bb3-9af6-56934dce2597">
<prototypeId>d4f69cb0-864e-4895-b6fd-152072774909</prototypeId>
<componentRootId>c7ef8bd2-65a3-4bb3-9af6-56934dce2597</componentRootId>
<name>StaticColumn</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="bc6afb28-7884-477d-b425-2c2001be8379">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<complex>
<entry>
<key>noDataValue</key>
<value>
<simple>"Неопределенно"</simple>
</value>
</entry>
</complex>
<implRef type="TS">
<className>DefaultValueFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="a930059f-1e14-40ed-a4de-3dec3d03f9a7">
<properties>
<entry>
<key>displayName</key>
<value>
<simple>"Время действия"</simple>
<simple>"ONE_COLUMN"</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<complex>
<entry>
<key>column</key>
<value>
<simple>"finish"</simple>
</value>
</entry>
<entry>
<key>filterType</key>
<value>
<simple>"TEXT"</simple>
</value>
</entry>
<entry>
<key>type</key>
<value>
<simple>"java.lang.String"</simple>
</value>
</entry>
</complex>
<simple>{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"role_name"}</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="94c069b2-9ca9-432f-b759-9c2012dfdff6">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>94c069b2-9ca9-432f-b759-9c2012dfdff6</componentRootId>
<name>Column</name>
<container>false</container>
<removed>true</removed>
</children>
</children>
<children id="96d710bb-26a2-4ee6-b18b-9c51edf83d9c">
<prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

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

@ -1249,13 +1249,49 @@
<entry>
<key>label</key>
<value>
<simple>"Изменение пользователя"</simple>
<simple>"Изменение основных данных пользователя"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>"EDIT_USER"</simple>
<simple>"EDIT_USER_MAIN"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="b45da941-e0a2-45a3-8f3e-8ef4f0f55e76" removed="false">
<value>
<complex>
<entry>
<key>label</key>
<value>
<simple>"Изменение учетной записи пользователя"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>"EDIT_USER_ACCOUNT"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="b58cec7b-f755-4a46-a81e-be1ccc95ce21" removed="false">
<value>
<complex>
<entry>
<key>label</key>
<value>
<simple>"Изменение ролей пользователя"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>"EDIT_USER_ROLES"</simple>
</value>
</entry>
</complex>
@ -1279,6 +1315,25 @@
</complex>
</value>
</item>
<item id="480774f8-1334-4d3f-b269-dc5ac86570ca" removed="false">
<value>
<complex>
<entry>
<key>label</key>
<value>
<simple>"Сброс пароля пользователя"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>"RESET_PASSWORD"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="d5d754ef-476f-4bf3-94e6-593dc6df11e8" removed="true"/>
<item id="efdcf7db-f926-4db7-b0b5-f756ce222cb2" removed="true"/>
<item id="9acffaaf-888a-4d94-8897-1098bc106842" removed="true"/>
<item id="5cb50f1a-ad13-4224-aa34-91816154c181" removed="true"/>
@ -3736,7 +3791,75 @@
</complex>
</value>
</item>
<item id="3b3fac0c-d629-4213-90ae-09842d615214" removed="false">
<item id="3b3fac0c-d629-4213-90ae-09842d615214" removed="true"/>
<item id="19007514-21ec-4bc7-b84b-c270824376ec" 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":"df951b69-a0bb-422e-b3ef-f5976671dba1","packageName":"component.grid","className":"GridV2","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getSelectedRowId"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="84d422b1-2240-4e5e-8fb7-47b338611cac" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>group</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="f9d0044a-7703-4652-9d37-222323bd8cd0" removed="false">
<value>
<complex>
<entry>
@ -3804,7 +3927,7 @@
</complex>
</value>
</item>
<item id="19007514-21ec-4bc7-b84b-c270824376ec" removed="false">
<item id="8106e3b5-5892-4a29-8d8a-712b7c943be4" removed="false">
<value>
<complex>
<entry>
@ -3828,13 +3951,13 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"df951b69-a0bb-422e-b3ef-f5976671dba1","packageName":"component.grid","className":"GridV2","type":"TS"}</simple>
<simple>{"objectId":"d717893e-debd-454a-adda-e900c0cadf5a","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getSelectedRowId"</simple>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
@ -3843,10 +3966,41 @@
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"RESET_PASSWORD"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"OR"</simple>
</value>
</entry>
</complex>