Merge branch 'develop' into release/1.9.14

# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml

backend/src/main/java/ru/micord/ervu/account_applications/component/dao/AuditDao.java

@@ -0,0 +1,42 @@
+package ru.micord.ervu.account_applications.component.dao;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+import org.jooq.DSLContext;
+import org.springframework.stereotype.Repository;
+
+
+import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList.USER_APPLICATION_LIST;
+import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
+
+/**
+ * @author Eduard Tihomirov
+ */
+@Repository
+public class AuditDao {
+
+  private final DSLContext dslContext;
+
+  public AuditDao(DSLContext dslContext) {
+    this.dslContext = dslContext;
+  }
+
+  public void insert(Long listId, String fio, String login, String status, Timestamp timestamp) {
+    dslContext.insertInto(USER_APPLICATION_LIST_AUDIT)
+        .set(USER_APPLICATION_LIST_AUDIT.USER_APPLICATION_LIST_ID, listId)
+        .set(USER_APPLICATION_LIST_AUDIT.FIO, fio)
+        .set(USER_APPLICATION_LIST_AUDIT.STATUS, status)
+        .set(USER_APPLICATION_LIST_AUDIT.DATE, timestamp)
+        .set(USER_APPLICATION_LIST_AUDIT.LOGIN, login)
+        .execute();
+  }
+
+  public List<Long> selectAppListIdsByTraceId(String traceId) {
+    return dslContext.select(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID)
+        .from(USER_APPLICATION_LIST)
+        .where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId))
+        .fetch(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID);
+  }
+
+}

backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java

@@ -0,0 +1,51 @@
+package ru.micord.ervu.account_applications.component.service;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import dao.container.FormDaoImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.micord.ervu.account_applications.component.dao.AuditDao;
+import ru.micord.ervu.account_applications.security.context.SecurityContext;
+import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
+
+import ru.cg.webbpm.modules.database.api.bean.TableFieldData;
+import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
+
+import static ru.micord.ervu.account_applications.enums.ApplicationStatus.SENT;
+
+/**
+ * @author Eduard Tihomirov
+ */
+@Service
+public class AuditFormDaoImpl extends FormDaoImpl {
+
+  @Autowired
+  private SecurityContext securityContext;
+  @Autowired
+  private AuditDao auditDao;
+
+  @Override
+  public List<TableFieldData> save(Map<EntityColumn, Object> map) {
+    List<TableFieldData> tableFieldData = super.save(map);
+    UserSession userSession = securityContext.getUserSession();
+    Optional<String> status = map.entrySet().stream()
+        .filter(entry -> entry.getKey().getName().equals("application_status"))
+        .map(entry -> entry.getValue().toString())
+        .findAny();
+
+    Optional<Long> appListId = tableFieldData.stream()
+        .filter(data -> data.getField().getName().equals("user_application_list_id"))
+        .map(data -> (Long) data.getData())
+        .findAny();
+    if (status.isPresent() && appListId.isPresent() && !status.get().equals(SENT.name())) {
+      auditDao.insert(appListId.get(), userSession.name(), userSession.userId(), status.get(), Timestamp.valueOf(
+          LocalDateTime.now()));
+    }
+    return tableFieldData;
+  }
+}

backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java

@@ -20,6 +20,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
+import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.DatabasechangeloglockRecord;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.JobPositionRecord;
@@ -30,6 +31,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.records.LinkU
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.RecruitmentRecord;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.ShedlockRecord;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationDocumentRecord;
+import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListAuditRecord;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListRecord;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationRoleRecord;
 
@@ -60,6 +62,7 @@ public class Keys {
     public static final UniqueKey<ShedlockRecord> SHEDLOCK_PK = Internal.createUniqueKey(Shedlock.SHEDLOCK, DSL.name("shedlock_pk"), new TableField[] { Shedlock.SHEDLOCK.NAME }, true);
     public static final UniqueKey<UserApplicationDocumentRecord> PK_USER_APPLICATION_DOCUMENT = Internal.createUniqueKey(UserApplicationDocument.USER_APPLICATION_DOCUMENT, DSL.name("pk_user_application_document"), new TableField[] { UserApplicationDocument.USER_APPLICATION_DOCUMENT.USER_APPLICATION_DOCUMENT_ID }, true);
     public static final UniqueKey<UserApplicationListRecord> PK_USER_APPLICATION_LIST = Internal.createUniqueKey(UserApplicationList.USER_APPLICATION_LIST, DSL.name("pk_user_application_list"), new TableField[] { UserApplicationList.USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID }, true);
+    public static final UniqueKey<UserApplicationListAuditRecord> USER_APPLICATION_LIST_AUDIT_PKEY = Internal.createUniqueKey(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT, DSL.name("user_application_list_audit_pkey"), new TableField[] { UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT.ID }, true);
     public static final UniqueKey<UserApplicationRoleRecord> USER_APPLICATION_ROLE_PKEY = Internal.createUniqueKey(UserApplicationRole.USER_APPLICATION_ROLE, DSL.name("user_application_role_pkey"), new TableField[] { UserApplicationRole.USER_APPLICATION_ROLE.USER_ROLE_ID }, true);
     public static final UniqueKey<UserApplicationRoleRecord> USER_APPLICATION_ROLE_ROLE_NAME_KEY = Internal.createUniqueKey(UserApplicationRole.USER_APPLICATION_ROLE, DSL.name("user_application_role_role_name_key"), new TableField[] { UserApplicationRole.USER_APPLICATION_ROLE.ROLE_NAME }, true);
 

backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java

@@ -24,6 +24,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
+import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
 
 
@@ -97,6 +98,11 @@ public class Public extends SchemaImpl {
      */
     public final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
 
+    /**
+     * The table <code>public.user_application_list_audit</code>.
+     */
+    public final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
+
     /**
      * The table <code>public.user_application_role</code>.
      */
@@ -139,6 +145,7 @@ public class Public extends SchemaImpl {
             Shedlock.SHEDLOCK,
             UserApplicationDocument.USER_APPLICATION_DOCUMENT,
             UserApplicationList.USER_APPLICATION_LIST,
+            UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT,
             UserApplicationRole.USER_APPLICATION_ROLE
         );
     }

backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java

@@ -15,6 +15,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
+import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
 import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
 
 
@@ -81,6 +82,11 @@ public class Tables {
      */
     public static final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
 
+    /**
+     * The table <code>public.user_application_list_audit</code>.
+     */
+    public static final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
+
     /**
      * The table <code>public.user_application_role</code>.
      */

backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationListAudit.java

@@ -0,0 +1,254 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package ru.micord.ervu.account_applications.db_beans.public_.tables;
+
+
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.UUID;
+
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.PlainSQL;
+import org.jooq.QueryPart;
+import org.jooq.SQL;
+import org.jooq.Schema;
+import org.jooq.Select;
+import org.jooq.Stringly;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.SQLDataType;
+import org.jooq.impl.TableImpl;
+
+import ru.micord.ervu.account_applications.db_beans.public_.Keys;
+import ru.micord.ervu.account_applications.db_beans.public_.Public;
+import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListAuditRecord;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class UserApplicationListAudit extends TableImpl<UserApplicationListAuditRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>public.user_application_list_audit</code>
+     */
+    public static final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = new UserApplicationListAudit();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<UserApplicationListAuditRecord> getRecordType() {
+        return UserApplicationListAuditRecord.class;
+    }
+
+    /**
+     * The column <code>public.user_application_list_audit.id</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, UUID> ID = createField(DSL.name("id"), SQLDataType.UUID.nullable(false).defaultValue(DSL.field(DSL.raw("uuid_generate_v4()"), SQLDataType.UUID)), this, "");
+
+    /**
+     * The column
+     * <code>public.user_application_list_audit.user_application_list_id</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, Long> USER_APPLICATION_LIST_ID = createField(DSL.name("user_application_list_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
+
+    /**
+     * The column <code>public.user_application_list_audit.date</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, Timestamp> DATE = createField(DSL.name("date"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, "");
+
+    /**
+     * The column <code>public.user_application_list_audit.status</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, String> STATUS = createField(DSL.name("status"), SQLDataType.VARCHAR(100), this, "");
+
+    /**
+     * The column <code>public.user_application_list_audit.fio</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, String> FIO = createField(DSL.name("fio"), SQLDataType.VARCHAR(1000), this, "");
+
+    /**
+     * The column <code>public.user_application_list_audit.login</code>.
+     */
+    public final TableField<UserApplicationListAuditRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.VARCHAR(1000), this, "");
+
+    private UserApplicationListAudit(Name alias, Table<UserApplicationListAuditRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private UserApplicationListAudit(Name alias, Table<UserApplicationListAuditRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>public.user_application_list_audit</code> table
+     * reference
+     */
+    public UserApplicationListAudit(String alias) {
+        this(DSL.name(alias), USER_APPLICATION_LIST_AUDIT);
+    }
+
+    /**
+     * Create an aliased <code>public.user_application_list_audit</code> table
+     * reference
+     */
+    public UserApplicationListAudit(Name alias) {
+        this(alias, USER_APPLICATION_LIST_AUDIT);
+    }
+
+    /**
+     * Create a <code>public.user_application_list_audit</code> table reference
+     */
+    public UserApplicationListAudit() {
+        this(DSL.name("user_application_list_audit"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : Public.PUBLIC;
+    }
+
+    @Override
+    public Identity<UserApplicationListAuditRecord, Long> getIdentity() {
+        return (Identity<UserApplicationListAuditRecord, Long>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<UserApplicationListAuditRecord> getPrimaryKey() {
+        return Keys.USER_APPLICATION_LIST_AUDIT_PKEY;
+    }
+
+    @Override
+    public UserApplicationListAudit as(String alias) {
+        return new UserApplicationListAudit(DSL.name(alias), this);
+    }
+
+    @Override
+    public UserApplicationListAudit as(Name alias) {
+        return new UserApplicationListAudit(alias, this);
+    }
+
+    @Override
+    public UserApplicationListAudit as(Table<?> alias) {
+        return new UserApplicationListAudit(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public UserApplicationListAudit rename(String name) {
+        return new UserApplicationListAudit(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public UserApplicationListAudit rename(Name name) {
+        return new UserApplicationListAudit(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public UserApplicationListAudit rename(Table<?> name) {
+        return new UserApplicationListAudit(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit where(Condition condition) {
+        return new UserApplicationListAudit(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public UserApplicationListAudit where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public UserApplicationListAudit where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public UserApplicationListAudit where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public UserApplicationListAudit where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public UserApplicationListAudit whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationListAuditRecord.java

@@ -0,0 +1,144 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package ru.micord.ervu.account_applications.db_beans.public_.tables.records;
+
+
+import java.sql.Timestamp;
+import java.util.UUID;
+
+import org.jooq.Record1;
+import org.jooq.impl.UpdatableRecordImpl;
+
+import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class UserApplicationListAuditRecord extends UpdatableRecordImpl<UserApplicationListAuditRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Setter for <code>public.user_application_list_audit.id</code>.
+     */
+    public void setId(UUID value) {
+        set(0, value);
+    }
+
+    /**
+     * Getter for <code>public.user_application_list_audit.id</code>.
+     */
+    public UUID getId() {
+        return (UUID) get(0);
+    }
+
+    /**
+     * Setter for
+     * <code>public.user_application_list_audit.user_application_list_id</code>.
+     */
+    public void setUserApplicationListId(Long value) {
+        set(1, value);
+    }
+
+    /**
+     * Getter for
+     * <code>public.user_application_list_audit.user_application_list_id</code>.
+     */
+    public Long getUserApplicationListId() {
+        return (Long) get(1);
+    }
+
+    /**
+     * Setter for <code>public.user_application_list_audit.date</code>.
+     */
+    public void setDate(Timestamp value) {
+        set(2, value);
+    }
+
+    /**
+     * Getter for <code>public.user_application_list_audit.date</code>.
+     */
+    public Timestamp getDate() {
+        return (Timestamp) get(2);
+    }
+
+    /**
+     * Setter for <code>public.user_application_list_audit.status</code>.
+     */
+    public void setStatus(String value) {
+        set(3, value);
+    }
+
+    /**
+     * Getter for <code>public.user_application_list_audit.status</code>.
+     */
+    public String getStatus() {
+        return (String) get(3);
+    }
+
+    /**
+     * Setter for <code>public.user_application_list_audit.fio</code>.
+     */
+    public void setFio(String value) {
+        set(4, value);
+    }
+
+    /**
+     * Getter for <code>public.user_application_list_audit.fio</code>.
+     */
+    public String getFio() {
+        return (String) get(4);
+    }
+
+    /**
+     * Setter for <code>public.user_application_list_audit.login</code>.
+     */
+    public void setLogin(String value) {
+        set(5, value);
+    }
+
+    /**
+     * Getter for <code>public.user_application_list_audit.login</code>.
+     */
+    public String getLogin() {
+        return (String) get(5);
+    }
+
+    // -------------------------------------------------------------------------
+    // Primary key information
+    // -------------------------------------------------------------------------
+
+    @Override
+    public Record1<UUID> key() {
+        return (Record1) super.key();
+    }
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    /**
+     * Create a detached UserApplicationListAuditRecord
+     */
+    public UserApplicationListAuditRecord() {
+        super(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT);
+    }
+
+    /**
+     * Create a detached, initialised UserApplicationListAuditRecord
+     */
+    public UserApplicationListAuditRecord(UUID id, Long userApplicationListId, Timestamp date, String status, String fio, String login) {
+        super(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT);
+
+        setId(id);
+        setUserApplicationListId(userApplicationListId);
+        setDate(date);
+        setStatus(status);
+        setFio(fio);
+        setLogin(login);
+        resetChangedOnNotNull();
+    }
+}

backend/src/main/java/ru/micord/ervu/account_applications/kafka/ErvuDirectoriesListener.java

@@ -23,4 +23,24 @@ public class ErvuDirectoriesListener {
   public void listenKafkaRole(String kafkaMessage) {
     ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
   }
+// Пока не заведены, обещают в будущих апдейтах создать
+//  @KafkaListener(id = "${kafka.role.updated.group.id}", topics = "${kafka.role.updated}")
+//  public void listenKafkaRoleUpdated(String kafkaMessage) {
+//    ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
+//  }
+
+  //  @KafkaListener(id = "${kafka.role.created.group.id}", topics = "${kafka.role.created}")
+//  public void listenKafkaRoleUpdated(String kafkaMessage) {
+//    ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
+//  }
+
+  @KafkaListener(id = "${kafka.domain.updated.group.id}", topics = "${kafka.domain.updated}")
+  public void listenKafkaDomainUpdated(String kafkaMessage) {
+    ervuDirectoriesService.upsertKafkaDomainMessage(kafkaMessage);
+  }
+
+  @KafkaListener(id = "${kafka.domain.created.group.id}", topics = "${kafka.domain.created}")
+  public void listenKafkaDomainCreated(String kafkaMessage) {
+    ervuDirectoriesService.upsertKafkaDomainMessage(kafkaMessage);
+  }
 }

backend/src/main/java/ru/micord/ervu/account_applications/kafka/KafkaConfig.java

@@ -12,9 +12,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
 
 /**
  * @author Eduard Tihomirov
@@ -40,6 +40,11 @@ public class KafkaConfig {
     return new DefaultKafkaConsumerFactory<>(consumerConfigs());
   }
 
+  @Bean
+  public KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry() {
+    return new KafkaListenerEndpointRegistry();
+  }
+
   @Bean
   public Map<String, Object> consumerConfigs() {
     Map<String, Object> props = new HashMap<>();

backend/src/main/java/ru/micord/ervu/account_applications/kafka/KafkaConsumerInitializer.java

@@ -0,0 +1,40 @@
+package ru.micord.ervu.account_applications.kafka;
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
+import ru.micord.ervu.account_applications.service.ErvuDirectoriesService;
+
+/**
+ * @author Eduard Tihomirov
+ */
+@Component
+@DependsOn("ervuDirectoriesListener")
+public class KafkaConsumerInitializer {
+  @Value("${load.directories:true}")
+  private Boolean loadDirectories;
+
+  private final ErvuDirectoriesService ervuDirectoriesService;
+
+  public KafkaConsumerInitializer(ErvuDirectoriesService ervuDirectoriesService) {
+    this.ervuDirectoriesService = ervuDirectoriesService;
+  }
+
+  @PostConstruct
+  public void init() {
+    if (loadDirectories) {
+      new Thread(this::runWithSleep).start();
+    }
+  }
+
+  private void runWithSleep() {
+    try {
+      Thread.sleep(10000);
+    }
+    catch (InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+    ervuDirectoriesService.updateDirectories();
+  }
+}

backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -34,14 +35,16 @@ import ru.micord.ervu.account_applications.model.RoleResponse;
  * @author Eduard Tihomirov
  */
 @Service
-@DependsOn({"liquibase", "ervuDirectoriesListener"})
+@DependsOn("liquibase")
 public class ErvuDirectoriesService {
   private static final Logger LOGGER = LoggerFactory.getLogger(
       MethodHandles.lookup().lookupClass());
   @Value("${idm.url}")
   private String idmUrl;
-  @Value("${ervu.collection:domain, role}")
+  @Value("${ervu.directories:domain, role}")
-  private String ervuCollection;
+  private String ervuDirectories;
+  @Value("${ervu.admin.role:gomu_supervisor, system_administrator, security_administrator, Responsible_for_internal_control}")
+  private String ervuAdminRole;
   @Autowired
   private RestTemplate restTemplate;
   @Autowired
@@ -56,9 +59,9 @@ public class ErvuDirectoriesService {
   })
   public void updateDirectories() {
     try {
-      String[] ervuCollectionArray = ervuCollection.split(",");
+      String[] ervuDirectoriesArray = ervuDirectories.split(",");
-      Arrays.stream(ervuCollectionArray).forEach(ervuCollection -> {
+      Arrays.stream(ervuDirectoriesArray).forEach(ervuCollection -> {
-        String targetUrl = idmUrl + "/reconcile/"+ ervuCollection + "/to/kafka/v1";
+        String targetUrl = idmUrl + "/reconcile/"+ ervuCollection.trim() + "/to/kafka/v1";
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         String emptyJson = "{}";
@@ -163,6 +166,7 @@ public class ErvuDirectoriesService {
   }
 
   private void upsertRoleData(List<RoleResponse.Data> dataList) {
+    String[] adminRoles = ervuAdminRole.split(",");
     List<UserApplicationRoleRecord> newRoleRecords = new ArrayList<>();
     List<UserApplicationRoleRecord> roleRecords = new ArrayList<>();
     List<String> ids = ervuDirectoriesDaoService.getRoleIds();
@@ -183,6 +187,12 @@ public class ErvuDirectoriesService {
       roleRecord.setCreated(createdAt);
       roleRecord.setUpdated(updatedAt);
       roleRecord.setFinished(finishAt);
+      Optional<String> adminRoleOptional = Arrays.stream(adminRoles)
+          .filter(role -> role.trim().equals(data.getName()))
+          .findAny();
+      if (adminRoleOptional.isPresent()) {
+        roleRecord.setAdminRole(true);
+      }
       if (ids.contains(data.getId())) {
         roleRecords.add(roleRecord);
       }

backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesUpdateShedulerService.java

@@ -1,47 +0,0 @@
-package ru.micord.ervu.account_applications.service;
-
-import javax.annotation.PostConstruct;
-
-import net.javacrumbs.shedlock.core.SchedulerLock;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import static org.springframework.scheduling.config.ScheduledTaskRegistrar.CRON_DISABLED;
-
-/**
- * @author Eduard Tihomirov
- */
-@Service
-public class ErvuDirectoriesUpdateShedulerService {
-
-  @Autowired
-  private ErvuDirectoriesService ervuDirectoriesService;
-
-  @Value("${directory.update.cron:0 0 */1 * * *}")
-  private String cronLoad;
-
-  @PostConstruct
-  public void init() {
-    if (!cronLoad.equals(CRON_DISABLED)) {
-      new Thread(this::runWithSleep).start();
-    }
-  }
-
-  private void runWithSleep() {
-    try {
-      Thread.sleep(100000);
-    }
-    catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-    run();
-  }
-
-  @Scheduled(cron = "${directory.update.cron:0 0 */1 * * *}")
-  @SchedulerLock(name = "updateDirectories")
-  public void run() {
-    ervuDirectoriesService.updateDirectories();
-  }
-}

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

@@ -38,8 +38,8 @@ public class RoleServiceImpl extends AbstractUserDataService {
   public List<String> fetchRemovedRoleIds(String accountId, Set<String> newRoleIds) {
     try {
       return fetchRolesByAccountId(accountId).stream()
+          .filter(role -> role.isErvuRole() && !newRoleIds.contains(role.getId()))
           .map(Role::getId)
-          .filter(id -> !newRoleIds.contains(id))
           .toList();
     }
     catch (Exception e) {

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

@@ -1,8 +1,19 @@
 package ru.micord.ervu.account_applications.service;
 
 
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.stereotype.Service;
+import ru.micord.ervu.account_applications.component.dao.AuditDao;
 import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
+import ru.micord.ervu.account_applications.security.context.SecurityContext;
+import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
+
+import static ru.micord.ervu.account_applications.enums.ApplicationStatus.ACCEPTED;
+import static ru.micord.ervu.account_applications.enums.ApplicationStatus.AGREED;
 
 /**
  * @author gulnaz
@@ -11,9 +22,13 @@ import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
 public class UserApplicationListService {
 
   private final UserApplicationListDao dao;
+  private final AuditDao auditDao;
+  private final SecurityContext securityContext;
 
-  public UserApplicationListService(UserApplicationListDao dao) {
+  public UserApplicationListService(UserApplicationListDao dao, AuditDao auditDao, SecurityContext securityContext) {
     this.dao = dao;
+    this.auditDao = auditDao;
+    this.securityContext = securityContext;
   }
 
   public void saveTraceId(String traceId, long appNumber) {
@@ -22,6 +37,7 @@ public class UserApplicationListService {
 
   public void savePassword(String traceId, String encodedPass) {
     dao.savePassword(traceId, encodedPass);
+    saveAuditStatusByTraceId(traceId, ACCEPTED.name());
   }
 
   public boolean userExists(String login){
@@ -30,6 +46,7 @@ public class UserApplicationListService {
 
   public void saveAcceptedStatus(String traceId) {
     dao.saveAcceptedStatus(traceId);
+    saveAuditStatusByTraceId(traceId, ACCEPTED.name());
   }
 
   public void saveAgreedStatus(long appNumber) {
@@ -38,5 +55,16 @@ public class UserApplicationListService {
 
   public void saveError(String traceId, String errorMsg) {
     dao.saveError(traceId, errorMsg);
+    saveAuditStatusByTraceId(traceId, AGREED.name());
+  }
+
+  private void saveAuditStatusByTraceId(String traceId, String status) {
+    List<Long> appListIds = auditDao.selectAppListIdsByTraceId(traceId);
+    UserSession userSession = securityContext.getUserSession();
+    String name = userSession.name();
+    String userId = userSession.userId();
+    appListIds.forEach(id -> {
+      auditDao.insert(id, name, userId, status, Timestamp.valueOf(LocalDateTime.now()));
+    });
   }
 }

backend/src/main/resources/config/v_1.0/20250411_SUPPORT-9099_add_audit.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+  <changeSet id="0001" author="tihomirov">
+    <comment>add audit table</comment>
+    <sql>
+      CREATE TABLE IF NOT EXISTS public.user_application_list_audit (
+      id uuid NOT NULL DEFAULT uuid_generate_v4(),
+      user_application_list_id bigserial,
+      date TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),
+      status character varying(100),
+      fio character varying(1000),
+      login character varying(1000)
+      )
+      TABLESPACE pg_default;
+
+      ALTER TABLE IF EXISTS public.user_application_list_audit
+      OWNER TO ervu_account_applications;
+
+      GRANT ALL ON TABLE public.user_application_role TO ervu_account_applications;
+    </sql>
+  </changeSet>
+
+</databaseChangeLog>

backend/src/main/resources/config/v_1.0/20250415_SUPPORT-9099_add_pk.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+  <changeSet id="0001" author="tihomirov">
+    <comment>add pk audit table</comment>
+    <sql>
+      ALTER TABLE public.user_application_list_audit ADD PRIMARY KEY (id)
+    </sql>
+  </changeSet>
+
+</databaseChangeLog>

backend/src/main/resources/config/v_1.0/changelog-1.0.xml

@@ -20,4 +20,6 @@
 	<include file="20250324-SUPPORT-9023_add_sent_date.xml" relativeToChangelogFile="true"/>
 	<include file="20250404-SUPPORT-9080_add_role_code.xml" relativeToChangelogFile="true"/>
 	<include file="20250410-SUPPORT-9098_admin_role.xml" relativeToChangelogFile="true"/>
+	<include file="20250411_SUPPORT-9099_add_audit.xml" relativeToChangelogFile="true"/>
+	<include file="20250415_SUPPORT-9099_add_pk.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

config/micord.env

@@ -20,6 +20,8 @@ KAFKA_USER=user1
 KAFKA_PASS=Blfi9d2OFG
 KAFKA_CONSUMER_GROUP_ID=1
 KAFKA_DOMAIN_GROUP_ID=ervu-account-applications-backend-domain
+KAFKA_DOMAIN_UPDATED_GROUP_ID=ervu-account-applications-backend-domain-updated
+KAFKA_DOMAIN_CREATED_GROUP_ID=ervu-account-applications-backend-domain-updated
 KAFKA_ROLE_GROUP_ID=ervu-account-applications-backend-role
 IDM_URL=http://idm
 
@@ -28,4 +30,6 @@ ERVU_HTTP_TIMEOUT=30
 ERVU_PWD_SIGN_SECRET_KEY=xoL2Y3VRdQ4phXG85o6dRqcgqb4bk6ULdkJJdlRLhZM=
 KAFKA_ROLE_RECONCILIATION=idmv2.role.reconciliation
 KAFKA_DOMAIN_RECONCILIATION=idmv2.domain.reconciliation
+KAFKA_DOMAIN_UPDATED=idmv2.domain.created
+KAFKA_DOMAIN_CREATED=idmv2.domain.updated
 ERVU_ROLE_ADMIN=security_administrator

frontend/src/resources/css/components-autority.css

@@ -300,6 +300,10 @@
 .webbpm.account-applications dropdown-tree-view .bi-caret-right-fill::before {
     content: "\f4fd";
 }
+.webbpm.account-applications dropdown-tree-view :focus {
+    outline: none !important;
+    box-shadow: none !important;
+}
 /* DropDownTree end */
 
 .webbpm.account-applications .selectize-dropdown, 

frontend/src/resources/template/account_applications/component/field/DropdownTreeView.html

@@ -4,7 +4,7 @@
            [hidden]="!label" class="control-label">
         <span>{{label}}<span *ngIf="isRequired()" class="alarm"> *</span></span>
     </label>
-    <div>
+    <div tabindex="0" (keydown)="onKeyDown($event)">
         <ngx-dropdown-treeview-select
             [items]="items"
             [maxHeight]="maxHeight"

frontend/src/ts/account_applications/component/button/UserManagementService.ts

@@ -48,15 +48,16 @@ export class UserManagementService extends Behavior {
   private onClickFunction: Function;
   private sendToErvu: boolean = false;
   private rpc: UserApplicationListRpcService;
+  private authService: AuthorizationService;
 
   initialize() {
     super.initialize();
     this.button = this.getScript(SaveButton);
     this.httpClient = this.injector.get(HttpClient);
     this.rpc = this.getScript(UserApplicationListRpcService);
-    let authService = this.injector.get(AuthorizationService);
+    this.authService = this.injector.get(AuthorizationService);
     this.onClickFunction = () => {
-      if (!authService.hasRole('security_administrator') || !this.sendToErvu) {
+      if (!this.authService.hasRole('security_administrator') || !this.sendToErvu) {
         return;
       }
       let kind = this.applicationKind.getValue();
@@ -79,6 +80,7 @@ export class UserManagementService extends Behavior {
           request = new CreateAccountRequest();
           request.data = createData;
           request.processKey = ProcessKey.CREATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_MAIN:
           let editPersonData = new EditPersonData();
@@ -87,6 +89,7 @@ export class UserManagementService extends Behavior {
           request = new EditPersonRequest();
           request.data = editPersonData;
           request.processKey = ProcessKey.EDIT_PERSON;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_ACCOUNT:
           let editAccountData = new EditAccountData();
@@ -96,6 +99,7 @@ export class UserManagementService extends Behavior {
           request = new EditAccountRequest();
           request.data = editAccountData;
           request.processKey = ProcessKey.EDIT_ACCOUNT;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_ROLES:
           let editRolesAccount = new EditRolesAccount();
@@ -108,12 +112,15 @@ export class UserManagementService extends Behavior {
             return role;
           });
           this.rpc.getRemovedRoleIds(accountId, rolesList)
-              .then(list => editRolesAccount.removeRoles = list);
+              .then(list => {
-          let editRolesData = new EditRolesData();
+                editRolesAccount.removeRoles = list;
-          editRolesData.account = editRolesAccount;
+                let editRolesData = new EditRolesData();
-          request = new EditRolesRequest();
+                editRolesData.account = editRolesAccount;
-          request.data = editRolesData;
+                request = new EditRolesRequest();
-          request.processKey = ProcessKey.EDIT_ROLES;
+                request.data = editRolesData;
+                request.processKey = ProcessKey.EDIT_ROLES;
+                this.doRequest(request, formJson['appNumber']);
+              });
           break;
         case ApplicationKind.BLOCK_USER:
           let deactivationData = new ChangeActivationData();
@@ -121,6 +128,7 @@ export class UserManagementService extends Behavior {
           request = new ChangeActivationRequest();
           request.data = deactivationData;
           request.processKey = ProcessKey.DEACTIVATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.UNBLOCK_USER:
           let activationData = new ChangeActivationData();
@@ -128,6 +136,7 @@ export class UserManagementService extends Behavior {
           request = new ChangeActivationRequest();
           request.data = activationData;
           request.processKey = ProcessKey.ACTIVATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.RESET_PASSWORD:
           let resetPasswordAccount = new ResetPasswordAccount();
@@ -137,12 +146,10 @@ export class UserManagementService extends Behavior {
           request = new ResetPasswordRequest();
           request.data = resetPasswordData;
           request.processKey = ProcessKey.RESET_PASSWORD;
+          this.doRequest(request, formJson['appNumber']);
           break;
       }
-
+    };
-      request.userId = authService.getUserId();
-      this.doRequest(request, formJson['appNumber']);
-    }
   }
 
   @Visible()
@@ -171,6 +178,7 @@ export class UserManagementService extends Behavior {
 
   private doRequest(request: any, appNumber: number): void {
     const url = window.location.origin + UserManagementService.PROCESS_START_PATH;
+    request.userId = this.authService.getUserId();
     this.httpClient.post(url, request).toPromise()
         .then((response: ProcessResponse) => {
           let code = response.code;

frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts

@@ -8,6 +8,7 @@ import {
 import {
   AdvancedProperty,
   Event,
+  EventUtils,
   InputControl,
   LocalStorageService,
   NotNull,
@@ -269,6 +270,15 @@ export class DropdownTreeViewComponent extends InputControl {
     return null;
   }
 
+  onKeyDown(event: KeyboardEvent): void {
+    const isInput = (event.target as HTMLElement).tagName === 'INPUT';
+    if (EventUtils.isKeyBackspace(event) && !isInput && this.value) {
+      this.clearValue();
+      event.stopPropagation();
+      event.preventDefault();
+    }
+  }
+
   onChange() {
     super.onChange();
     this.valueChangeEvent.trigger(this.value);

frontend/src/ts/modules/app/app-routing.module.ts

@@ -5,11 +5,6 @@ import {RolesGuard} from "./guard/RolesGuard";
 
 
 const appRoutes: Routes = [
-  {
-    path: 'home',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
-    canActivate: [ConfirmExitGuard, RolesGuard]
-  },
   {
     path: 'app_list',
     loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',

frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts

@@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
   },
   {
     path: '',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
+    loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
     canActivate: [ConfirmExitGuard, RolesGuard],
     pathMatch: 'full',
   },

frontend/src/ts/modules/webbpm/webbpm-routing.module.ts

@@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
   },
   {
     path: '',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
+    loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
     canActivate: [ConfirmExitGuard, RolesGuard],
     pathMatch: 'full',
   },

resources/src/main/resources/business-model/home.page

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xmlPage>
-    <id>home</id>
-    <versions>
-        <studioVersion>3.192.3</studioVersion>
-        <packageVersions>
-            <entry>
-                <key>ru.cg.webbpm.packages.base.resources</key>
-                <value>3.192.3</value>
-            </entry>
-        </packageVersions>
-    </versions>
-    <rootObjects id="b0d8793f-51d3-49c2-b2d4-a6b4b6d8f037">
-        <prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
-        <componentRootId>b0d8793f-51d3-49c2-b2d4-a6b4b6d8f037</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="e2039705-146c-45b9-adb5-315f4bfcd7b6" removed="false">
-                            <value>
-<simple>"btn-big-group"</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="240c9b7b-b6a5-40c9-82f3-c54924205a32">
-            <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
-            <componentRootId>240c9b7b-b6a5-40c9-82f3-c54924205a32</componentRootId>
-            <name>Vbox</name>
-            <container>true</container>
-            <expanded>false</expanded>
-            <childrenReordered>false</childrenReordered>
-            <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
-            <scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
-            <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
-            <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
-            <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
-            <children id="5efb3252-df02-47da-8e3d-dc4517b3fc9f">
-                <prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
-                <componentRootId>5efb3252-df02-47da-8e3d-dc4517b3fc9f</componentRootId>
-                <name>Список пользователей</name>
-                <container>false</container>
-                <removed>true</removed>
-            </children>
-        </children>
-        <children id="e8dc240c-e610-49c9-8f0e-df53dde5eff2">
-            <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
-            <componentRootId>e8dc240c-e610-49c9-8f0e-df53dde5eff2</componentRootId>
-            <name>Vbox</name>
-            <container>true</container>
-            <childrenReordered>false</childrenReordered>
-            <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
-            <scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
-            <scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
-            <scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
-            <scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
-            <children id="5ace6303-ecf8-40a2-ad53-3dc08b46c1e0">
-                <prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
-                <componentRootId>5ace6303-ecf8-40a2-ad53-3dc08b46c1e0</componentRootId>
-                <name>Список заявок</name>
-                <container>false</container>
-                <expanded>false</expanded>
-                <childrenReordered>false</childrenReordered>
-                <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
-                    <properties>
-                        <entry>
-                            <key>caption</key>
-                            <value>
-<simple>"Список заявок"</simple>
-                            </value>
-                        </entry>
-                        <entry>
-                            <key>navigateTo</key>
-                            <value>
-<simple>"/app_list"</simple>
-                            </value>
-                        </entry>
-                    </properties>
-                </scripts>
-            </children>
-        </children>
-    </rootObjects>
-</xmlPage>

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

@@ -15,6 +15,7 @@
         <componentRootId>e776df9b-b752-4023-84f7-b9c47874f664</componentRootId>
         <name>Hbox</name>
         <container>true</container>
+        <expanded>false</expanded>
         <childrenReordered>false</childrenReordered>
         <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
         <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -2375,6 +2376,10 @@
             </value>
         </entry>
     </complex>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
 </value>
                             </entry>
                             <entry>
@@ -2408,6 +2413,7 @@
             <componentRootId>eaaf9ba1-feca-4c41-9944-e321eee27a58</componentRootId>
             <name>Hbox</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
             <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -4765,6 +4771,202 @@
                 </children>
             </children>
         </children>
+        <children id="788f8661-b614-440c-b526-47e36d1d83e9">
+            <prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
+            <componentRootId>788f8661-b614-440c-b526-47e36d1d83e9</componentRootId>
+            <name>Grid</name>
+            <container>true</container>
+            <expanded>false</expanded>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
+                <properties>
+                    <entry>
+                        <key>autoStretchColumns</key>
+                        <value>
+                            <simple>true</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>parentControl</key>
+                        <value>
+                            <simple>{"objectId":"eeff6f45-ecc1-4055-b367-2d1249b65698","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="1996166f-7922-4f28-a571-9646d956ef37">
+                <properties>
+                    <entry>
+                        <key>gridService</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>dependencyLink</key>
+    <value>
+        <simple>{"schema":"public","table":"user_application_list_audit","entity":"user_application_list_audit","name":"user_application_list_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_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_list_audit":{"tableName":"user_application_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="be8fe0e1-4909-4224-8664-be55168595c6">
+                <properties>
+                    <entry>
+                        <key>columnSorts</key>
+                        <value>
+                            <item id="35bf331e-74d9-4601-8e7b-6fae69a99bdd" removed="false">
+<value>
+    <complex>
+        <entry>
+            <key>field</key>
+            <value>
+                <simple>{"schema":"public","table":"user_application_list_audit","entity":"user_application_list_audit","name":"date"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>sortOrder</key>
+            <value>
+                <simple>"ASC"</simple>
+            </value>
+        </entry>
+    </complex>
+</value>
+                            </item>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <children id="ebf72c64-fee0-4ece-9b62-bb402072332c">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>ebf72c64-fee0-4ece-9b62-bb402072332c</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_audit","entity":"user_application_list_audit","name":"date"}</simple>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>formatter</key>
+                            <value>
+<implRef type="JAVA">
+    <className>DateTimeFormatter</className>
+    <packageName>custom.grid.formatter</packageName>
+</implRef>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="4c258d4d-c044-432e-93d6-d3eb3ca19fd1">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>4c258d4d-c044-432e-93d6-d3eb3ca19fd1</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_audit","entity":"user_application_list_audit","name":"status"}</simple>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>formatter</key>
+                            <value>
+<implRef type="JAVA">
+    <className>EnumColumnFormatter</className>
+    <packageName>ru.micord.ervu.account_applications</packageName>
+</implRef>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="36c8e8cd-51a8-4efd-a4d6-272acf7684bf">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>36c8e8cd-51a8-4efd-a4d6-272acf7684bf</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_audit","entity":"user_application_list_audit","name":"fio"}</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="40fa7d80-c06b-4b1e-8b8f-378a2eaea176">
+                <prototypeId>d4ad6186-5d2a-4e96-b77a-22f00b8a9eaa</prototypeId>
+                <componentRootId>40fa7d80-c06b-4b1e-8b8f-378a2eaea176</componentRootId>
+                <name>check box (column)</name>
+                <container>false</container>
+                <removed>true</removed>
+            </children>
+        </children>
         <children id="ded6434a-e76d-436e-88d5-3eb87545cd9e">
             <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
             <componentRootId>ded6434a-e76d-436e-88d5-3eb87545cd9e</componentRootId>
@@ -4779,13 +4981,6 @@
             <container>true</container>
             <removed>true</removed>
         </children>
-        <children id="6ee95a07-1f65-4848-afe7-b6788502fb6b">
-            <prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
-            <componentRootId>6ee95a07-1f65-4848-afe7-b6788502fb6b</componentRootId>
-            <name>Grid</name>
-            <container>true</container>
-            <removed>true</removed>
-        </children>
         <children id="27764b05-3a3e-4bed-b1dd-d032f990240d">
             <prototypeId>f9a38417-9ad0-412a-9b5f-bbeb450dddd6</prototypeId>
             <componentRootId>27764b05-3a3e-4bed-b1dd-d032f990240d</componentRootId>
@@ -4819,6 +5014,7 @@
             <componentRootId>2ee6f91b-c4a2-461d-8428-c3a6a13c9244</componentRootId>
             <name>hidden</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                 <properties>
@@ -5112,6 +5308,66 @@
                     </properties>
                 </scripts>
             </children>
+            <children id="eeff6f45-ecc1-4055-b367-2d1249b65698">
+                <prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
+                <componentRootId>eeff6f45-ecc1-4055-b367-2d1249b65698</componentRootId>
+                <name>user_application_list_id_combo</name>
+                <container>false</container>
+                <childrenReordered>false</childrenReordered>
+                <scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
+                    <properties>
+                        <entry>
+                            <key>label</key>
+                            <value>
+<simple>"user_application_list_id_combo"</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                    <properties>
+                        <entry>
+                            <key>comboBoxService</key>
+                            <value>
+<complex>
+    <entry>
+        <key>displayColumn</key>
+        <value>
+            <simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_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_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_list":{"tableName":"user_application_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                    </value>
+                </entry>
+            </complex>
+        </value>
+    </entry>
+</complex>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
+                <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
+                <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
+                <scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
+                    <properties>
+                        <entry>
+                            <key>columnForSave</key>
+                            <value>
+<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_id"}</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
         </children>
         <children id="8feb55f1-bbef-4cf9-83b5-5cbcffe5b9e6">
             <prototypeId>3057d447-6d17-48a8-b096-b14ea88d17e8</prototypeId>
@@ -5125,6 +5381,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"/>
@@ -8486,6 +8743,7 @@
         <componentRootId>902e5a0d-aee1-400a-a5ee-c5ca7db63017</componentRootId>
         <name>Hbox</name>
         <container>true</container>
+        <expanded>false</expanded>
         <childrenReordered>false</childrenReordered>
         <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
             <properties>

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

@@ -859,6 +859,10 @@
             </value>
         </entry>
     </complex>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
 </value>
                             </entry>
                             <entry>
@@ -896,6 +900,7 @@
                 <componentRootId>317d3481-41e0-4516-94a5-93a49aac2622</componentRootId>
                 <name>Основные данные</name>
                 <container>true</container>
+                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
                     <properties>
@@ -1736,19 +1741,6 @@
             <simple>false</simple>
         </value>
     </entry>
-    <entry>
-        <key>style</key>
-        <value>
-            <complex>
-                <entry>
-                    <key>maxHeight</key>
-                    <value>
-                        <simple>"130px"</simple>
-                    </value>
-                </entry>
-            </complex>
-        </value>
-    </entry>
 </properties>
                             </scripts>
                             <scripts id="1996166f-7922-4f28-a571-9646d956ef37">
@@ -2595,6 +2587,7 @@
                 <componentRootId>f3f030e1-226f-44cb-932f-c25eea54da6e</componentRootId>
                 <name>Учетные записи</name>
                 <container>true</container>
+                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
                     <properties>
@@ -2990,6 +2983,7 @@
                 <componentRootId>57f4208e-96f4-44dd-8b03-7ee84077b128</componentRootId>
                 <name>Роли</name>
                 <container>true</container>
+                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
                     <properties>
@@ -3047,19 +3041,6 @@
 <key>rowModelType</key>
 <value>
     <simple>"CLIENT_SIDE"</simple>
-</value>
-                            </entry>
-                            <entry>
-<key>style</key>
-<value>
-    <complex>
-        <entry>
-            <key>maxHeight</key>
-            <value>
-                <simple>"130px"</simple>
-            </value>
-        </entry>
-    </complex>
 </value>
                             </entry>
                         </properties>
@@ -3351,13 +3332,6 @@
             <container>true</container>
             <removed>true</removed>
         </children>
-        <children id="6ee95a07-1f65-4848-afe7-b6788502fb6b">
-            <prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
-            <componentRootId>6ee95a07-1f65-4848-afe7-b6788502fb6b</componentRootId>
-            <name>Grid</name>
-            <container>true</container>
-            <removed>true</removed>
-        </children>
         <children id="27764b05-3a3e-4bed-b1dd-d032f990240d">
             <prototypeId>f9a38417-9ad0-412a-9b5f-bbeb450dddd6</prototypeId>
             <componentRootId>27764b05-3a3e-4bed-b1dd-d032f990240d</componentRootId>
@@ -3391,6 +3365,7 @@
             <componentRootId>2ee6f91b-c4a2-461d-8428-c3a6a13c9244</componentRootId>
             <name>hidden</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                 <properties>
@@ -4167,6 +4142,66 @@
                     </properties>
                 </scripts>
             </children>
+            <children id="be74a7cb-5883-4d10-b789-1af3e2532e93">
+                <prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
+                <componentRootId>be74a7cb-5883-4d10-b789-1af3e2532e93</componentRootId>
+                <name>user_application_list_id_combo</name>
+                <container>false</container>
+                <childrenReordered>false</childrenReordered>
+                <scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
+                    <properties>
+                        <entry>
+                            <key>label</key>
+                            <value>
+<simple>"user_application_list_id_combo"</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                    <properties>
+                        <entry>
+                            <key>comboBoxService</key>
+                            <value>
+<complex>
+    <entry>
+        <key>displayColumn</key>
+        <value>
+            <simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_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_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_list":{"tableName":"user_application_list","schemaName":"public","x":585.0,"y":339.0,"alias":"user_application_list","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                    </value>
+                </entry>
+            </complex>
+        </value>
+    </entry>
+</complex>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+                <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
+                <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
+                <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
+                <scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
+                    <properties>
+                        <entry>
+                            <key>columnForSave</key>
+                            <value>
+<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"user_application_list_id"}</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
         </children>
         <children id="8feb55f1-bbef-4cf9-83b5-5cbcffe5b9e6">
             <prototypeId>3057d447-6d17-48a8-b096-b14ea88d17e8</prototypeId>
@@ -7529,6 +7564,230 @@
                 </scripts>
             </children>
         </children>
+        <children id="0048a346-f6c1-4917-9662-f69b27b95399">
+            <prototypeId>76e91ef4-d2ef-4662-96ad-84c0dae0ecff</prototypeId>
+            <componentRootId>0048a346-f6c1-4917-9662-f69b27b95399</componentRootId>
+            <name>Editable grid</name>
+            <container>true</container>
+            <removed>true</removed>
+        </children>
+        <children id="8485a38d-f225-4a13-b3ec-e5407aeb0886">
+            <prototypeId>16071adb-3bdf-4c33-b29b-886876016415</prototypeId>
+            <componentRootId>8485a38d-f225-4a13-b3ec-e5407aeb0886</componentRootId>
+            <name>Grid</name>
+            <container>true</container>
+            <expanded>false</expanded>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
+                <properties>
+                    <entry>
+                        <key>autoStretchColumns</key>
+                        <value>
+                            <simple>true</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>parentControl</key>
+                        <value>
+                            <simple>{"objectId":"be74a7cb-5883-4d10-b789-1af3e2532e93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="1996166f-7922-4f28-a571-9646d956ef37">
+                <properties>
+                    <entry>
+                        <key>gridService</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>dependencyLink</key>
+    <value>
+        <simple>{"schema":"public","table":"user_application_list_audit","entity":"user_application_list_audit","name":"user_application_list_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_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"user_application_list_audit":{"tableName":"user_application_list_audit","schemaName":"public","x":314.0,"y":225.0,"alias":"user_application_list_audit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="be8fe0e1-4909-4224-8664-be55168595c6">
+                <properties>
+                    <entry>
+                        <key>columnSorts</key>
+                        <value>
+                            <item id="07fefff7-3895-4cc8-b8f3-078747a2bfde" removed="false">
+<value>
+    <complex>
+        <entry>
+            <key>field</key>
+            <value>
+                <simple>{"schema":"public","table":"user_application_list_audit","entity":"user_application_list_audit","name":"date"}</simple>
+            </value>
+        </entry>
+        <entry>
+            <key>sortOrder</key>
+            <value>
+                <simple>"ASC"</simple>
+            </value>
+        </entry>
+    </complex>
+</value>
+                            </item>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <children id="d4579764-d600-4331-80f2-1a1bf7128564">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>d4579764-d600-4331-80f2-1a1bf7128564</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_audit","entity":"user_application_list_audit","name":"date"}</simple>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>formatter</key>
+                            <value>
+<implRef type="JAVA">
+    <className>DateTimeFormatter</className>
+    <packageName>custom.grid.formatter</packageName>
+</implRef>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="54b8e2a3-17ca-465d-985c-5a481b9e5179">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>54b8e2a3-17ca-465d-985c-5a481b9e5179</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_audit","entity":"user_application_list_audit","name":"status"}</simple>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>formatter</key>
+                            <value>
+<implRef type="JAVA">
+    <className>EnumColumnFormatter</className>
+    <packageName>ru.micord.ervu.account_applications</packageName>
+</implRef>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="fdd618d0-d8a7-4e2c-a880-879345f750e8">
+                <prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
+                <componentRootId>fdd618d0-d8a7-4e2c-a880-879345f750e8</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_audit","entity":"user_application_list_audit","name":"fio"}</simple>
+                            </value>
+                        </entry>
+                    </properties>
+                </scripts>
+            </children>
+            <children id="eb3b94ab-82dc-4742-9d54-fe37f83a5aaa">
+                <prototypeId>d4ad6186-5d2a-4e96-b77a-22f00b8a9eaa</prototypeId>
+                <componentRootId>eb3b94ab-82dc-4742-9d54-fe37f83a5aaa</componentRootId>
+                <name>check box (column)</name>
+                <container>false</container>
+                <removed>true</removed>
+            </children>
+        </children>
+        <children id="69863dbf-ee75-4dcd-8878-7f8b5f299995">
+            <prototypeId>c4b63ae3-f093-4b74-891b-d16e2a35644e</prototypeId>
+            <componentRootId>69863dbf-ee75-4dcd-8878-7f8b5f299995</componentRootId>
+            <name>Numberfield (filter)</name>
+            <container>false</container>
+            <removed>true</removed>
+        </children>
+        <children id="c5665a13-d2d1-4dff-8d2d-16eebeffc9a4">
+            <prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
+            <componentRootId>c5665a13-d2d1-4dff-8d2d-16eebeffc9a4</componentRootId>
+            <name>Number field</name>
+            <container>false</container>
+            <removed>true</removed>
+        </children>
+        <children id="be74a7cb-5883-4d10-b789-1af3e2532e93">
+            <prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
+            <componentRootId>be74a7cb-5883-4d10-b789-1af3e2532e93</componentRootId>
+            <name>user_application_list_id_combo</name>
+            <container>false</container>
+            <removed>true</removed>
+        </children>
         <children id="b838c4d9-b8f2-4142-96fe-240540a4802e">
             <prototypeId>312c9663-86b4-4672-97bd-67d313585c00</prototypeId>
             <componentRootId>b838c4d9-b8f2-4142-96fe-240540a4802e</componentRootId>
@@ -7823,6 +8082,19 @@
                             <simple>true</simple>
                         </value>
                     </entry>
+                    <entry>
+                        <key>style</key>
+                        <value>
+                            <complex>
+                                <entry>
+                                    <key>margin</key>
+                                        <value>
+                                            <simple>"0px 0px 10px 0px"</simple>
+                                        </value>
+                                </entry>
+                            </complex>
+                        </value>
+                    </entry>
                 </properties>
             </scripts>
         </children>
@@ -8875,12 +9147,5 @@
                 </properties>
             </scripts>
         </children>
-        <children id="85ec8ffc-5684-43a5-8274-0dc08109c3e0">
-            <prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
-            <componentRootId>85ec8ffc-5684-43a5-8274-0dc08109c3e0</componentRootId>
-            <name>Hbox_process_application</name>
-            <container>true</container>
-            <removed>true</removed>
-        </children>
     </rootObjects>
 </xmlPage>

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

@@ -799,6 +799,10 @@
                             <entry>
 <key>formDao</key>
 <value>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
     <complex>
         <entry>
             <key>graph</key>

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

@@ -4914,6 +4914,10 @@
             </value>
         </entry>
     </complex>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
 </value>
                             </entry>
                             <entry>
@@ -8866,13 +8870,6 @@
                         <container>false</container>
                         <removed>true</removed>
                     </children>
-                    <children id="5b8c5ac4-549d-411f-80ff-d29293638e5f">
-                        <prototypeId>887d2044-9e34-46a5-852c-e9ce07b42f30</prototypeId>
-                        <componentRootId>5b8c5ac4-549d-411f-80ff-d29293638e5f</componentRootId>
-                        <name>Пол</name>
-                        <container>false</container>
-                        <removed>true</removed>
-                    </children>
                     <children id="39040b94-4780-4067-864e-64ad3d22a2a3">
                         <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
                         <componentRootId>39040b94-4780-4067-864e-64ad3d22a2a3</componentRootId>

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

@@ -4915,6 +4915,10 @@
             </value>
         </entry>
     </complex>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
 </value>
                             </entry>
                             <entry>
@@ -8867,13 +8871,6 @@
                         <container>false</container>
                         <removed>true</removed>
                     </children>
-                    <children id="5b8c5ac4-549d-411f-80ff-d29293638e5f">
-                        <prototypeId>887d2044-9e34-46a5-852c-e9ce07b42f30</prototypeId>
-                        <componentRootId>5b8c5ac4-549d-411f-80ff-d29293638e5f</componentRootId>
-                        <name>Пол</name>
-                        <container>false</container>
-                        <removed>true</removed>
-                    </children>
                     <children id="39040b94-4780-4067-864e-64ad3d22a2a3">
                         <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
                         <componentRootId>39040b94-4780-4067-864e-64ad3d22a2a3</componentRootId>

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

@@ -4866,6 +4866,10 @@
                     </value>
                 </entry>
             </complex>
+            <implRef type="JAVA">
+                <className>AuditFormDaoImpl</className>
+                <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+            </implRef>
         </value>
     </entry>
     <entry>
@@ -9127,6 +9131,10 @@
                     </value>
                 </entry>
             </complex>
+            <implRef type="JAVA">
+                <className>AuditFormDaoImpl</className>
+                <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+            </implRef>
         </value>
     </entry>
     <entry>
@@ -13439,6 +13447,10 @@
                     </value>
                 </entry>
             </complex>
+            <implRef type="JAVA">
+                <className>AuditFormDaoImpl</className>
+                <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+            </implRef>
         </value>
     </entry>
     <entry>

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

@@ -4924,6 +4924,10 @@
             </value>
         </entry>
     </complex>
+    <implRef type="JAVA">
+        <className>AuditFormDaoImpl</className>
+        <packageName>ru.micord.ervu.account_applications.component.service</packageName>
+    </implRef>
 </value>
                             </entry>
                             <entry>

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

@@ -6002,44 +6002,6 @@
         <scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
         <scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
         <scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
-        <children id="ed485923-da58-4370-8522-9b34be995953">
-            <prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
-            <componentRootId>ed485923-da58-4370-8522-9b34be995953</componentRootId>
-            <name>Выход</name>
-            <container>false</container>
-            <childrenReordered>false</childrenReordered>
-            <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
-                <removed>true</removed>
-            </scripts>
-            <scripts id="10c7c68b-9e68-4fa6-abc2-edc98d8e9fa3">
-                <classRef type="TS">
-                    <className>StaticRouteNavigationButton</className>
-                    <packageName>modules.user-management.component</packageName>
-                </classRef>
-                <enabled>true</enabled>
-                <expanded>true</expanded>
-                <properties>
-                    <entry>
-                        <key>caption</key>
-                        <value>
-                            <simple>"Выход"</simple>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>route</key>
-                        <value>
-                            <simple>"/home"</simple>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>visible</key>
-                        <value>
-                            <simple>true</simple>
-                        </value>
-                    </entry>
-                </properties>
-            </scripts>
-        </children>
     </rootObjects>
     <rootObjects id="e4f91512-684f-4db0-8868-65fd9464076e">
         <prototypeId>86f297f1-ab3d-40e0-ac2f-89cc944b7f0a</prototypeId>