ERVU-458

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Auth.java

@@ -30,7 +30,7 @@ public class Auth extends SchemaImpl {
     public static final Auth AUTH = new Auth();
 
     /**
-     * The table <code>auth.active_session</code>.
+     * Активные сессии пользователей
      */
     public final ActiveSession ACTIVE_SESSION = ActiveSession.ACTIVE_SESSION;
 

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Tables.java

@@ -15,7 +15,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.FailedAuth;
 public class Tables {
 
     /**
-     * The table <code>auth.active_session</code>.
+     * Активные сессии пользователей
      */
     public static final ActiveSession ACTIVE_SESSION = ActiveSession.ACTIVE_SESSION;
 

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/ActiveSession.java

@@ -29,7 +29,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.records.Activ
 
 
 /**
- * This class is generated by jOOQ.
+ * Активные сессии пользователей
  */
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ActiveSession extends TableImpl<ActiveSessionRecord> {
@@ -50,31 +50,35 @@ public class ActiveSession extends TableImpl<ActiveSessionRecord> {
     }
 
     /**
-     * The column <code>auth.active_session.session_id</code>.
+     * The column <code>auth.active_session.session_id</code>. Идентификатор
+     * сессии
      */
-    public final TableField<ActiveSessionRecord, String> SESSION_ID = createField(DSL.name("session_id"), SQLDataType.VARCHAR(128).nullable(false), this, "");
+    public final TableField<ActiveSessionRecord, String> SESSION_ID = createField(DSL.name("session_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор сессии");
 
     /**
-     * The column <code>auth.active_session.domain_id</code>.
+     * The column <code>auth.active_session.domain_id</code>. Идентификатор
+     * домена
      */
-    public final TableField<ActiveSessionRecord, String> DOMAIN_ID = createField(DSL.name("domain_id"), SQLDataType.VARCHAR(128).nullable(false), this, "");
+    public final TableField<ActiveSessionRecord, String> DOMAIN_ID = createField(DSL.name("domain_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор домена");
 
     /**
-     * The column <code>auth.active_session.user_id</code>.
+     * The column <code>auth.active_session.user_id</code>. Идентификатор
+     * пользователя
      */
-    public final TableField<ActiveSessionRecord, String> USER_ID = createField(DSL.name("user_id"), SQLDataType.VARCHAR(128).nullable(false), this, "");
+    public final TableField<ActiveSessionRecord, String> USER_ID = createField(DSL.name("user_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор пользователя");
 
     /**
-     * The column <code>auth.active_session.ip_address</code>.
+     * The column <code>auth.active_session.ip_address</code>. IP-адрес
+     * пользователя
      */
-    public final TableField<ActiveSessionRecord, String> IP_ADDRESS = createField(DSL.name("ip_address"), SQLDataType.VARCHAR(64), this, "");
+    public final TableField<ActiveSessionRecord, String> IP_ADDRESS = createField(DSL.name("ip_address"), SQLDataType.VARCHAR(64), this, "IP-адрес пользователя");
 
     private ActiveSession(Name alias, Table<ActiveSessionRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }
 
     private ActiveSession(Name alias, Table<ActiveSessionRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+        super(alias, null, aliased, parameters, DSL.comment("Активные сессии пользователей"), TableOptions.table(), where);
     }
 
     /**

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/records/ActiveSessionRecord.java

@@ -11,7 +11,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.ActiveSession
 
 
 /**
- * This class is generated by jOOQ.
+ * Активные сессии пользователей
  */
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class ActiveSessionRecord extends UpdatableRecordImpl<ActiveSessionRecord> {
@@ -19,56 +19,64 @@ public class ActiveSessionRecord extends UpdatableRecordImpl<ActiveSessionRecord
     private static final long serialVersionUID = 1L;
 
     /**
-     * Setter for <code>auth.active_session.session_id</code>.
+     * Setter for <code>auth.active_session.session_id</code>. Идентификатор
+     * сессии
      */
     public void setSessionId(String value) {
         set(0, value);
     }
 
     /**
-     * Getter for <code>auth.active_session.session_id</code>.
+     * Getter for <code>auth.active_session.session_id</code>. Идентификатор
+     * сессии
      */
     public String getSessionId() {
         return (String) get(0);
     }
 
     /**
-     * Setter for <code>auth.active_session.domain_id</code>.
+     * Setter for <code>auth.active_session.domain_id</code>. Идентификатор
+     * домена
      */
     public void setDomainId(String value) {
         set(1, value);
     }
 
     /**
-     * Getter for <code>auth.active_session.domain_id</code>.
+     * Getter for <code>auth.active_session.domain_id</code>. Идентификатор
+     * домена
      */
     public String getDomainId() {
         return (String) get(1);
     }
 
     /**
-     * Setter for <code>auth.active_session.user_id</code>.
+     * Setter for <code>auth.active_session.user_id</code>. Идентификатор
+     * пользователя
      */
     public void setUserId(String value) {
         set(2, value);
     }
 
     /**
-     * Getter for <code>auth.active_session.user_id</code>.
+     * Getter for <code>auth.active_session.user_id</code>. Идентификатор
+     * пользователя
      */
     public String getUserId() {
         return (String) get(2);
     }
 
     /**
-     * Setter for <code>auth.active_session.ip_address</code>.
+     * Setter for <code>auth.active_session.ip_address</code>. IP-адрес
+     * пользователя
      */
     public void setIpAddress(String value) {
         set(3, value);
     }
 
     /**
-     * Getter for <code>auth.active_session.ip_address</code>.
+     * Getter for <code>auth.active_session.ip_address</code>. IP-адрес
+     * пользователя
      */
     public String getIpAddress() {
         return (String) get(3);

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/IdmReconcile.java

@@ -13,6 +13,7 @@ import org.jooq.impl.SchemaImpl;
 
 import ru.micord.webbpm.ervu.business_metrics.db_beans.DefaultCatalog;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role;
@@ -36,6 +37,11 @@ public class IdmReconcile extends SchemaImpl {
      */
     public final Account ACCOUNT = Account.ACCOUNT;
 
+    /**
+     * The table <code>idm_reconcile.account_blocked</code>.
+     */
+    public final AccountBlocked ACCOUNT_BLOCKED = AccountBlocked.ACCOUNT_BLOCKED;
+
     /**
      * The table <code>idm_reconcile.account_role</code>.
      */
@@ -68,6 +74,7 @@ public class IdmReconcile extends SchemaImpl {
     public final List<Table<?>> getTables() {
         return Arrays.asList(
             Account.ACCOUNT,
+            AccountBlocked.ACCOUNT_BLOCKED,
             AccountRole.ACCOUNT_ROLE,
             Domain.DOMAIN,
             Role.ROLE

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Keys.java

@@ -11,9 +11,11 @@ import org.jooq.impl.DSL;
 import org.jooq.impl.Internal;
 
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountBlockedRecord;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRecord;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRoleRecord;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.DomainRecord;
@@ -32,6 +34,7 @@ public class Keys {
     // -------------------------------------------------------------------------
 
     public static final UniqueKey<AccountRecord> ACCOUNT_PKEY = Internal.createUniqueKey(Account.ACCOUNT, DSL.name("account_pkey"), new TableField[] { Account.ACCOUNT.ID }, true);
+    public static final UniqueKey<AccountBlockedRecord> ACCOUNT_BLOCKED_PKEY = Internal.createUniqueKey(AccountBlocked.ACCOUNT_BLOCKED, DSL.name("account_blocked_pkey"), new TableField[] { AccountBlocked.ACCOUNT_BLOCKED.ID }, true);
     public static final UniqueKey<AccountRoleRecord> PK_ACCOUNT_ROLE = Internal.createUniqueKey(AccountRole.ACCOUNT_ROLE, DSL.name("pk_account_role"), new TableField[] { AccountRole.ACCOUNT_ROLE.ACCOUNT_ID, AccountRole.ACCOUNT_ROLE.ROLE_ID }, true);
     public static final UniqueKey<DomainRecord> DOMAIN_PKEY = Internal.createUniqueKey(Domain.DOMAIN, DSL.name("domain_pkey"), new TableField[] { Domain.DOMAIN.ID }, true);
     public static final UniqueKey<RoleRecord> ROLE_PKEY = Internal.createUniqueKey(Role.ROLE, DSL.name("role_pkey"), new TableField[] { Role.ROLE.ID }, true);
@@ -40,7 +43,5 @@ public class Keys {
     // FOREIGN KEY definitions
     // -------------------------------------------------------------------------
 
-    public static final ForeignKey<AccountRecord, DomainRecord> ACCOUNT__FK_DOMAIN = Internal.createForeignKey(Account.ACCOUNT, DSL.name("fk_domain"), new TableField[] { Account.ACCOUNT.DOMAIN_ID }, Keys.DOMAIN_PKEY, new TableField[] { Domain.DOMAIN.ID }, true);
     public static final ForeignKey<AccountRoleRecord, AccountRecord> ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT = Internal.createForeignKey(AccountRole.ACCOUNT_ROLE, DSL.name("fk_account_role_account"), new TableField[] { AccountRole.ACCOUNT_ROLE.ACCOUNT_ID }, Keys.ACCOUNT_PKEY, new TableField[] { Account.ACCOUNT.ID }, true);
-    public static final ForeignKey<AccountRoleRecord, RoleRecord> ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE = Internal.createForeignKey(AccountRole.ACCOUNT_ROLE, DSL.name("fk_account_role_role"), new TableField[] { AccountRole.ACCOUNT_ROLE.ROLE_ID }, Keys.ROLE_PKEY, new TableField[] { Role.ROLE.ID }, true);
 }

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Tables.java

@@ -5,6 +5,7 @@ package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile;
 
 
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role;
@@ -21,6 +22,11 @@ public class Tables {
      */
     public static final Account ACCOUNT = Account.ACCOUNT;
 
+    /**
+     * The table <code>idm_reconcile.account_blocked</code>.
+     */
+    public static final AccountBlocked ACCOUNT_BLOCKED = AccountBlocked.ACCOUNT_BLOCKED;
+
     /**
      * The table <code>idm_reconcile.account_role</code>.
      */

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java

@@ -5,9 +5,7 @@ package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables;
 
 
 import java.sql.Timestamp;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 
 import org.jooq.Condition;
 import org.jooq.Field;
@@ -33,8 +31,6 @@ import org.jooq.impl.TableImpl;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole.AccountRolePath;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain.DomainPath;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role.RolePath;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRecord;
 
 
@@ -189,24 +185,6 @@ public class Account extends TableImpl<AccountRecord> {
         return Keys.ACCOUNT_PKEY;
     }
 
-    @Override
-    public List<ForeignKey<AccountRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.ACCOUNT__FK_DOMAIN);
-    }
-
-    private transient DomainPath _domain;
-
-    /**
-     * Get the implicit join path to the <code>idm_reconcile.domain</code>
-     * table.
-     */
-    public DomainPath domain() {
-        if (_domain == null)
-            _domain = new DomainPath(this, Keys.ACCOUNT__FK_DOMAIN, null);
-
-        return _domain;
-    }
-
     private transient AccountRolePath _accountRole;
 
     /**
@@ -220,14 +198,6 @@ public class Account extends TableImpl<AccountRecord> {
         return _accountRole;
     }
 
-    /**
-     * Get the implicit many-to-many join path to the
-     * <code>idm_reconcile.role</code> table
-     */
-    public RolePath role() {
-        return accountRole().role();
-    }
-
     @Override
     public Account as(String alias) {
         return new Account(DSL.name(alias), this);

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountBlocked.java

@@ -0,0 +1,236 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables;
+
+
+import java.util.Collection;
+
+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.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys;
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountBlockedRecord;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountBlocked extends TableImpl<AccountBlockedRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>idm_reconcile.account_blocked</code>
+     */
+    public static final AccountBlocked ACCOUNT_BLOCKED = new AccountBlocked();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<AccountBlockedRecord> getRecordType() {
+        return AccountBlockedRecord.class;
+    }
+
+    /**
+     * The column <code>idm_reconcile.account_blocked.account_id</code>.
+     */
+    public final TableField<AccountBlockedRecord, String> ACCOUNT_ID = createField(DSL.name("account_id"), SQLDataType.VARCHAR(36).nullable(false), this, "");
+
+    /**
+     * The column <code>idm_reconcile.account_blocked.blocked</code>.
+     */
+    public final TableField<AccountBlockedRecord, Boolean> BLOCKED = createField(DSL.name("blocked"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
+
+    /**
+     * The column <code>idm_reconcile.account_blocked.id</code>.
+     */
+    public final TableField<AccountBlockedRecord, Long> ID = createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
+
+    private AccountBlocked(Name alias, Table<AccountBlockedRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private AccountBlocked(Name alias, Table<AccountBlockedRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>idm_reconcile.account_blocked</code> table
+     * reference
+     */
+    public AccountBlocked(String alias) {
+        this(DSL.name(alias), ACCOUNT_BLOCKED);
+    }
+
+    /**
+     * Create an aliased <code>idm_reconcile.account_blocked</code> table
+     * reference
+     */
+    public AccountBlocked(Name alias) {
+        this(alias, ACCOUNT_BLOCKED);
+    }
+
+    /**
+     * Create a <code>idm_reconcile.account_blocked</code> table reference
+     */
+    public AccountBlocked() {
+        this(DSL.name("account_blocked"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : IdmReconcile.IDM_RECONCILE;
+    }
+
+    @Override
+    public Identity<AccountBlockedRecord, Long> getIdentity() {
+        return (Identity<AccountBlockedRecord, Long>) super.getIdentity();
+    }
+
+    @Override
+    public UniqueKey<AccountBlockedRecord> getPrimaryKey() {
+        return Keys.ACCOUNT_BLOCKED_PKEY;
+    }
+
+    @Override
+    public AccountBlocked as(String alias) {
+        return new AccountBlocked(DSL.name(alias), this);
+    }
+
+    @Override
+    public AccountBlocked as(Name alias) {
+        return new AccountBlocked(alias, this);
+    }
+
+    @Override
+    public AccountBlocked as(Table<?> alias) {
+        return new AccountBlocked(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public AccountBlocked rename(String name) {
+        return new AccountBlocked(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public AccountBlocked rename(Name name) {
+        return new AccountBlocked(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public AccountBlocked rename(Table<?> name) {
+        return new AccountBlocked(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked where(Condition condition) {
+        return new AccountBlocked(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public AccountBlocked where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public AccountBlocked where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public AccountBlocked where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public AccountBlocked where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public AccountBlocked whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountRole.java

@@ -32,7 +32,6 @@ import org.jooq.impl.TableImpl;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role.RolePath;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRoleRecord;
 
 
@@ -139,7 +138,7 @@ public class AccountRole extends TableImpl<AccountRoleRecord> {
 
     @Override
     public List<ForeignKey<AccountRoleRecord, ?>> getReferences() {
-        return Arrays.asList(Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE);
+        return Arrays.asList(Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT);
     }
 
     private transient AccountPath _account;
@@ -155,18 +154,6 @@ public class AccountRole extends TableImpl<AccountRoleRecord> {
         return _account;
     }
 
-    private transient RolePath _role;
-
-    /**
-     * Get the implicit join path to the <code>idm_reconcile.role</code> table.
-     */
-    public RolePath role() {
-        if (_role == null)
-            _role = new RolePath(this, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE, null);
-
-        return _role;
-    }
-
     @Override
     public AccountRole as(String alias) {
         return new AccountRole(DSL.name(alias), this);

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Domain.java

@@ -9,13 +9,9 @@ import java.util.Collection;
 
 import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.InverseForeignKey;
 import org.jooq.Name;
-import org.jooq.Path;
 import org.jooq.PlainSQL;
 import org.jooq.QueryPart;
-import org.jooq.Record;
 import org.jooq.SQL;
 import org.jooq.Schema;
 import org.jooq.Select;
@@ -30,7 +26,6 @@ import org.jooq.impl.TableImpl;
 
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.DomainRecord;
 
 
@@ -335,37 +330,6 @@ public class Domain extends TableImpl<DomainRecord> {
         this(DSL.name("domain"), null);
     }
 
-    public <O extends Record> Domain(Table<O> path, ForeignKey<O, DomainRecord> childPath, InverseForeignKey<O, DomainRecord> parentPath) {
-        super(path, childPath, parentPath, DOMAIN);
-    }
-
-    /**
-     * A subtype implementing {@link Path} for simplified path-based joins.
-     */
-    public static class DomainPath extends Domain implements Path<DomainRecord> {
-        public <O extends Record> DomainPath(Table<O> path, ForeignKey<O, DomainRecord> childPath, InverseForeignKey<O, DomainRecord> parentPath) {
-            super(path, childPath, parentPath);
-        }
-        private DomainPath(Name alias, Table<DomainRecord> aliased) {
-            super(alias, aliased);
-        }
-
-        @Override
-        public DomainPath as(String alias) {
-            return new DomainPath(DSL.name(alias), this);
-        }
-
-        @Override
-        public DomainPath as(Name alias) {
-            return new DomainPath(alias, this);
-        }
-
-        @Override
-        public DomainPath as(Table<?> alias) {
-            return new DomainPath(alias.getQualifiedName(), this);
-        }
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : IdmReconcile.IDM_RECONCILE;
@@ -376,19 +340,6 @@ public class Domain extends TableImpl<DomainRecord> {
         return Keys.DOMAIN_PKEY;
     }
 
-    private transient AccountPath _account;
-
-    /**
-     * Get the implicit to-many join path to the
-     * <code>idm_reconcile.account</code> table
-     */
-    public AccountPath account() {
-        if (_account == null)
-            _account = new AccountPath(this, null, Keys.ACCOUNT__FK_DOMAIN.getInverseKey());
-
-        return _account;
-    }
-
     @Override
     public Domain as(String alias) {
         return new Domain(DSL.name(alias), this);

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Role.java

@@ -9,13 +9,9 @@ import java.util.Collection;
 
 import org.jooq.Condition;
 import org.jooq.Field;
-import org.jooq.ForeignKey;
-import org.jooq.InverseForeignKey;
 import org.jooq.Name;
-import org.jooq.Path;
 import org.jooq.PlainSQL;
 import org.jooq.QueryPart;
-import org.jooq.Record;
 import org.jooq.SQL;
 import org.jooq.Schema;
 import org.jooq.Select;
@@ -30,8 +26,6 @@ import org.jooq.impl.TableImpl;
 
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath;
-import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole.AccountRolePath;
 import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.RoleRecord;
 
 
@@ -140,37 +134,6 @@ public class Role extends TableImpl<RoleRecord> {
         this(DSL.name("role"), null);
     }
 
-    public <O extends Record> Role(Table<O> path, ForeignKey<O, RoleRecord> childPath, InverseForeignKey<O, RoleRecord> parentPath) {
-        super(path, childPath, parentPath, ROLE);
-    }
-
-    /**
-     * A subtype implementing {@link Path} for simplified path-based joins.
-     */
-    public static class RolePath extends Role implements Path<RoleRecord> {
-        public <O extends Record> RolePath(Table<O> path, ForeignKey<O, RoleRecord> childPath, InverseForeignKey<O, RoleRecord> parentPath) {
-            super(path, childPath, parentPath);
-        }
-        private RolePath(Name alias, Table<RoleRecord> aliased) {
-            super(alias, aliased);
-        }
-
-        @Override
-        public RolePath as(String alias) {
-            return new RolePath(DSL.name(alias), this);
-        }
-
-        @Override
-        public RolePath as(Name alias) {
-            return new RolePath(alias, this);
-        }
-
-        @Override
-        public RolePath as(Table<?> alias) {
-            return new RolePath(alias.getQualifiedName(), this);
-        }
-    }
-
     @Override
     public Schema getSchema() {
         return aliased() ? null : IdmReconcile.IDM_RECONCILE;
@@ -181,27 +144,6 @@ public class Role extends TableImpl<RoleRecord> {
         return Keys.ROLE_PKEY;
     }
 
-    private transient AccountRolePath _accountRole;
-
-    /**
-     * Get the implicit to-many join path to the
-     * <code>idm_reconcile.account_role</code> table
-     */
-    public AccountRolePath accountRole() {
-        if (_accountRole == null)
-            _accountRole = new AccountRolePath(this, null, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE.getInverseKey());
-
-        return _accountRole;
-    }
-
-    /**
-     * Get the implicit many-to-many join path to the
-     * <code>idm_reconcile.account</code> table
-     */
-    public AccountPath account() {
-        return accountRole().account();
-    }
-
     @Override
     public Role as(String alias) {
         return new Role(DSL.name(alias), this);

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/AccountBlockedRecord.java

@@ -0,0 +1,94 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records;
+
+
+import org.jooq.Record1;
+import org.jooq.impl.UpdatableRecordImpl;
+
+import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountBlockedRecord extends UpdatableRecordImpl<AccountBlockedRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Setter for <code>idm_reconcile.account_blocked.account_id</code>.
+     */
+    public void setAccountId(String value) {
+        set(0, value);
+    }
+
+    /**
+     * Getter for <code>idm_reconcile.account_blocked.account_id</code>.
+     */
+    public String getAccountId() {
+        return (String) get(0);
+    }
+
+    /**
+     * Setter for <code>idm_reconcile.account_blocked.blocked</code>.
+     */
+    public void setBlocked(Boolean value) {
+        set(1, value);
+    }
+
+    /**
+     * Getter for <code>idm_reconcile.account_blocked.blocked</code>.
+     */
+    public Boolean getBlocked() {
+        return (Boolean) get(1);
+    }
+
+    /**
+     * Setter for <code>idm_reconcile.account_blocked.id</code>.
+     */
+    public void setId(Long value) {
+        set(2, value);
+    }
+
+    /**
+     * Getter for <code>idm_reconcile.account_blocked.id</code>.
+     */
+    public Long getId() {
+        return (Long) get(2);
+    }
+
+    // -------------------------------------------------------------------------
+    // Primary key information
+    // -------------------------------------------------------------------------
+
+    @Override
+    public Record1<Long> key() {
+        return (Record1) super.key();
+    }
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    /**
+     * Create a detached AccountBlockedRecord
+     */
+    public AccountBlockedRecord() {
+        super(AccountBlocked.ACCOUNT_BLOCKED);
+    }
+
+    /**
+     * Create a detached, initialised AccountBlockedRecord
+     */
+    public AccountBlockedRecord(String accountId, Boolean blocked, Long id) {
+        super(AccountBlocked.ACCOUNT_BLOCKED);
+
+        setAccountId(accountId);
+        setBlocked(blocked);
+        setId(id);
+        resetChangedOnNotNull();
+    }
+}

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java

@@ -79,6 +79,12 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImpl<ViewIncidentsCha
      */
     public final TableField<ViewIncidentsChangeDataFromGirVuRecord, BigDecimal> PERCENT_SEND_TO_GIR_VU = createField(DSL.name("percent_send_to_gir_vu"), SQLDataType.NUMERIC, this, "");
 
+    /**
+     * The column
+     * <code>metrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu</code>.
+     */
+    public final TableField<ViewIncidentsChangeDataFromGirVuRecord, Long> VARIANCE_COUNT_SEND_TO_GIR_VU = createField(DSL.name("variance_count_send_to_gir_vu"), SQLDataType.BIGINT, this, "");
+
     private ViewIncidentsChangeDataFromGirVu(Name alias, Table<ViewIncidentsChangeDataFromGirVuRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }
@@ -87,9 +93,10 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImpl<ViewIncidentsCha
         super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
         create view "view_incidents_change_data_from_gir_vu" as  SELECT incidents_change_data_from_gir_vu.incidents_change_data_from_gir_vu_id,
          (incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) AS count_all,
-         COALESCE(round((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal)::numeric * (100)::numeric) / NULLIF((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric, (0)::numeric))), (0)::numeric) AS percent_epgu_citizen_appeal,
+         COALESCE(round((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal)::numeric * (100)::numeric) / NULLIF(((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual))::numeric, (0)::numeric))), (0)::numeric) AS percent_epgu_citizen_appeal,
-         COALESCE(round((((incidents_change_data_from_gir_vu.count_manual)::numeric * (100)::numeric) / NULLIF((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric, (0)::numeric))), (0)::numeric) AS percent_manual,
+         COALESCE(round((((incidents_change_data_from_gir_vu.count_manual)::numeric * (100)::numeric) / NULLIF(((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual))::numeric, (0)::numeric))), (0)::numeric) AS percent_manual,
-         COALESCE(round((((incidents_change_data_from_gir_vu.count_send_to_gir_vu)::numeric * (100)::numeric) / NULLIF((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric, (0)::numeric))), (0)::numeric) AS percent_send_to_gir_vu
+         COALESCE(round((((incidents_change_data_from_gir_vu.count_send_to_gir_vu)::numeric * (100)::numeric) / NULLIF(((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual))::numeric, (0)::numeric))), (0)::numeric) AS percent_send_to_gir_vu,
+         ((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) - incidents_change_data_from_gir_vu.count_send_to_gir_vu) AS variance_count_send_to_gir_vu
         FROM metrics.incidents_change_data_from_gir_vu;
         """), where);
     }

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewIncidentsChangeDataFromGirVuRecord.java

@@ -99,6 +99,22 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImpl<View
         return (BigDecimal) get(4);
     }
 
+    /**
+     * Setter for
+     * <code>metrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu</code>.
+     */
+    public void setVarianceCountSendToGirVu(Long value) {
+        set(5, value);
+    }
+
+    /**
+     * Getter for
+     * <code>metrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu</code>.
+     */
+    public Long getVarianceCountSendToGirVu() {
+        return (Long) get(5);
+    }
+
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -113,7 +129,7 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImpl<View
     /**
      * Create a detached, initialised ViewIncidentsChangeDataFromGirVuRecord
      */
-    public ViewIncidentsChangeDataFromGirVuRecord(Long incidentsChangeDataFromGirVuId, Long countAll, BigDecimal percentEpguCitizenAppeal, BigDecimal percentManual, BigDecimal percentSendToGirVu) {
+    public ViewIncidentsChangeDataFromGirVuRecord(Long incidentsChangeDataFromGirVuId, Long countAll, BigDecimal percentEpguCitizenAppeal, BigDecimal percentManual, BigDecimal percentSendToGirVu, Long varianceCountSendToGirVu) {
         super(ViewIncidentsChangeDataFromGirVu.VIEW_INCIDENTS_CHANGE_DATA_FROM_GIR_VU);
 
         setIncidentsChangeDataFromGirVuId(incidentsChangeDataFromGirVuId);
@@ -121,6 +137,7 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImpl<View
         setPercentEpguCitizenAppeal(percentEpguCitizenAppeal);
         setPercentManual(percentManual);
         setPercentSendToGirVu(percentSendToGirVu);
+        setVarianceCountSendToGirVu(varianceCountSendToGirVu);
         resetChangedOnNotNull();
     }
 }

backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/registration_change_address/tables/ViewPersonalInfoStat.java

@@ -86,10 +86,10 @@ public class ViewPersonalInfoStat extends TableImpl<ViewPersonalInfoStatRecord>
     private ViewPersonalInfoStat(Name alias, Table<ViewPersonalInfoStatRecord> aliased, Field<?>[] parameters, Condition where) {
         super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
         create view "view_personal_info_stat" as  SELECT personal_info_stat.personal_info_stat_id,
-         (personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) AS count_all,
+         ((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded) AS count_all,
-         COALESCE(round((((personal_info_stat.count_refused)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_refused,
+         COALESCE(round((((personal_info_stat.count_refused)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_refused,
-         COALESCE(round((((personal_info_stat.count_unloaded)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_unloaded,
+         COALESCE(round((((personal_info_stat.count_unloaded)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_unloaded,
-         COALESCE(round((((personal_info_stat.count_accepted_to_send)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_accepted_to_send
+         COALESCE(round((((personal_info_stat.count_accepted_to_send)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_accepted_to_send
         FROM registration_change_address.personal_info_stat;
         """), where);
     }

resources/src/main/resources/business-model/ervu-business-metrics/incidents.page

@@ -1554,7 +1554,6 @@
                 <componentRootId>0ff9d3df-e12a-4872-a635-9252ef3d14d8</componentRootId>
                 <name>ГК Первый ряд</name>
                 <container>true</container>
-                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                     <properties>
@@ -1579,7 +1578,6 @@
                     <componentRootId>450ccffd-2fbb-4df7-9643-e981d1c69428</componentRootId>
                     <name>ВК Зарегистрированные инциденты</name>
                     <container>true</container>
-                    <expanded>false</expanded>
                     <childrenReordered>false</childrenReordered>
                     <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                         <properties>
@@ -2019,36 +2017,7 @@
                 </complex>
             </value>
         </item>
-        <item id="006d1ae2-cb89-4c3a-8e21-eb4ad72bc1db" removed="false">
+        <item id="006d1ae2-cb89-4c3a-8e21-eb4ad72bc1db" removed="true"/>
-            <value>
-                <complex>
-                    <entry>
-                        <key>aggregationColumn</key>
-                        <value>
-                            <simple>{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_send_to_gir_vu"}</simple>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>aggregationFunction</key>
-                        <value>
-                            <simple>"SUM"</simple>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>backgroundColor</key>
-                        <value>
-                            <simple>"#BACEE4FF"</simple>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>label</key>
-                        <value>
-                            <simple>"Отправлено из ГИР ВУ"</simple>
-                        </value>
-                    </entry>
-                </complex>
-            </value>
-        </item>
         <item id="b38aaeb5-04f1-4d85-bbe0-0ee9474249a5" removed="true"/>
         <item id="258b449b-763f-46c4-8e33-ad90a31aba03" removed="true"/>
         <item id="b8c4fb5a-51cb-4831-9a5e-633be2963b4c" removed="true"/>
@@ -2073,7 +2042,7 @@
                     <entry>
                         <key>cutout</key>
                         <value>
-                            <simple>"80%"</simple>
+                            <simple>"70%"</simple>
                         </value>
                     </entry>
                     <entry>
@@ -2108,6 +2077,125 @@
                 </complex>
             </value>
         </item>
+        <item id="9569d179-b9f2-4a05-84d8-9773da23c617" removed="false">
+            <value>
+                <complex>
+                    <entry>
+                        <key>columnAggregationDataSet</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>aggregationData</key>
+    <value>
+        <item id="099533d7-14ef-4055-868b-9b6d325ba064" removed="false">
+            <value>
+                <complex>
+                    <entry>
+                        <key>aggregationColumn</key>
+                        <value>
+                            <simple>{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_send_to_gir_vu"}</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>aggregationFunction</key>
+                        <value>
+                            <simple>"SUM"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>backgroundColor</key>
+                        <value>
+                            <simple>"#BACEE4FF"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>label</key>
+                        <value>
+                            <simple>"Отправлено из ГИР ВУ"</simple>
+                        </value>
+                    </entry>
+                </complex>
+            </value>
+        </item>
+        <item id="a67bd39e-7722-4f27-b781-061138807fe3" removed="false">
+            <value>
+                <complex>
+                    <entry>
+                        <key>aggregationColumn</key>
+                        <value>
+                            <simple>{"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"variance_count_send_to_gir_vu"}</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>aggregationFunction</key>
+                        <value>
+                            <simple>"SUM"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>backgroundColor</key>
+                        <value>
+                            <simple>"#F3F3F3FF"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>label</key>
+                        <value>
+                            <simple>" "</simple>
+                        </value>
+                    </entry>
+                </complex>
+            </value>
+        </item>
+    </value>
+</entry>
+<entry>
+    <key>dataLabel</key>
+    <value>
+        <simple>"Зарегистрировано, в т.ч.:"</simple>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>cutout</key>
+                        <value>
+                            <simple>"60%"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>datasetType</key>
+                        <value>
+                            <simple>"COLUMN_AGGREGATION"</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>loadDao</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>graph</key>
+    <value>
+        <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_incidents_change_data_from_gir_vu":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"view_incidents_change_data_from_gir_vu","refToEntityName":"incidents_change_data_from_gir_vu","refToColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"refOnColumns":[{"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0}</simple>
+    </value>
+</entry>
+                            </complex>
+                            <implRef type="JAVA">
+<className>DefaultLoadDao</className>
+<packageName>database.dao</packageName>
+                            </implRef>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>radius</key>
+                        <value>
+                            <simple>"70%"</simple>
+                        </value>
+                    </entry>
+                </complex>
+            </value>
+        </item>
         <item id="e6e94f6e-44b3-4738-89da-526d92a4c5f6" removed="true"/>
         <item id="e53f8a6c-ea97-4232-a2ae-815171cae143" removed="true"/>
     </value>
@@ -2130,6 +2218,7 @@
         <packageName>ervu_business_metrics.component.chart</packageName>
     </classRef>
     <enabled>true</enabled>
+    <expanded>true</expanded>
     <properties>
         <entry>
             <key>cssClasses</key>
@@ -3204,6 +3293,7 @@
                     <componentRootId>8c048d37-2167-4bfd-86b1-1e5ac6f71e2a</componentRootId>
                     <name>ВК инцидентов принято на рассмотрение</name>
                     <container>true</container>
+                    <expanded>false</expanded>
                     <childrenReordered>false</childrenReordered>
                     <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                         <properties>
@@ -3515,7 +3605,6 @@
                 <componentRootId>8522fcd7-8bd4-4750-97c2-a793048a220a</componentRootId>
                 <name>ГК Второй ряд</name>
                 <container>true</container>
-                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                     <properties>
@@ -4941,6 +5030,7 @@
                     <componentRootId>c90ef4f7-eb92-4035-a078-efe64e573db7</componentRootId>
                     <name>ВК Закрытые инциденты</name>
                     <container>true</container>
+                    <expanded>false</expanded>
                     <childrenReordered>false</childrenReordered>
                     <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                         <properties>
@@ -7234,6 +7324,7 @@
                 <componentRootId>9ded84c5-ed67-41f7-b562-522b524a899c</componentRootId>
                 <name>ГК Третий ряд</name>
                 <container>true</container>
+                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                     <properties>