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

Merge remote-tracking branch 'origin/develop' into feature/ERVU-189

Browse source
This commit is contained in:
m.epshtein 2024-11-27 15:08:08 +03:00
commit ad17196476
16 changed files with 1359 additions and 1368 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Keys.java
View file

@ -21,7 +21,6 @@ import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnit;
import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnitAdditionalInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.SimpleCredentials;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccount;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountAdditionInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountRefreshToken;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountVerification;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserGroup;
@ -36,7 +35,6 @@ import ru.micord.ervu.account_applications.db_beans.security.tables.records.Link
import ru.micord.ervu.account_applications.db_beans.security.tables.records.OrgUnitAdditionalInfoRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.OrgUnitRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.SimpleCredentialsRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.UserAccountAdditionInfoRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.UserAccountRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.UserAccountRefreshTokenRecord;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.UserAccountVerificationRecord;
@ -75,7 +73,6 @@ public class Keys {
public static final UniqueKey<SimpleCredentialsRecord> PK_DOMESTIC_USER = Internal.createUniqueKey(SimpleCredentials.SIMPLE_CREDENTIALS, DSL.name("pk_domestic_user"), new TableField[] { SimpleCredentials.SIMPLE_CREDENTIALS.USER_ACCOUNT_ID }, true);
public static final UniqueKey<UserAccountRecord> PK_USER = Internal.createUniqueKey(UserAccount.USER_ACCOUNT, DSL.name("pk_user"), new TableField[] { UserAccount.USER_ACCOUNT.USER_ACCOUNT_ID }, true);
public static final UniqueKey<UserAccountRecord> USER_ACCOUNT_USERNAME_UNIQUE = Internal.createUniqueKey(UserAccount.USER_ACCOUNT, DSL.name("user_account_username_unique"), new TableField[] { UserAccount.USER_ACCOUNT.USERNAME }, true);
public static final UniqueKey<UserAccountAdditionInfoRecord> PK_USER_ACCOUNT_ADDITION_INFO = Internal.createUniqueKey(UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO, DSL.name("pk_user_account_addition_info"), new TableField[] { UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO.USER_ACCOUNT_ADDITION_INFO_ID }, true);
public static final UniqueKey<UserAccountRefreshTokenRecord> PK_USER_ACCOUNT_REFRESH_TOKEN = Internal.createUniqueKey(UserAccountRefreshToken.USER_ACCOUNT_REFRESH_TOKEN, DSL.name("pk_user_account_refresh_token"), new TableField[] { UserAccountRefreshToken.USER_ACCOUNT_REFRESH_TOKEN.USER_ACCOUNT_REFRESH_TOKEN_ID }, true);
public static final UniqueKey<UserAccountVerificationRecord> PK_USER_ACCOUNT_VERIFICATION = Internal.createUniqueKey(UserAccountVerification.USER_ACCOUNT_VERIFICATION, DSL.name("pk_user_account_verification"), new TableField[] { UserAccountVerification.USER_ACCOUNT_VERIFICATION.USER_ACCOUNT_ID }, true);
public static final UniqueKey<UserGroupRecord> PK_GROUP = Internal.createUniqueKey(UserGroup.USER_GROUP, DSL.name("pk_group"), new TableField[] { UserGroup.USER_GROUP.USER_GROUP_ID }, true);
@ -97,7 +94,6 @@ public class Keys {
public static final ForeignKey<OrgUnitRecord, OrgUnitRecord> ORG_UNIT__FK_ORG_UNIT_PARENT_ID = Internal.createForeignKey(OrgUnit.ORG_UNIT, DSL.name("fk_org_unit_parent_id"), new TableField[] { OrgUnit.ORG_UNIT.PARENT_ID }, Keys.PK_ORG_UNIT, new TableField[] { OrgUnit.ORG_UNIT.ID }, true);
public static final ForeignKey<SimpleCredentialsRecord, UserAccountRecord> SIMPLE_CREDENTIALS__FK_DOMESTIC_USER1 = Internal.createForeignKey(SimpleCredentials.SIMPLE_CREDENTIALS, DSL.name("fk_domestic_user1"), new TableField[] { SimpleCredentials.SIMPLE_CREDENTIALS.USER_ACCOUNT_ID }, Keys.PK_USER, new TableField[] { UserAccount.USER_ACCOUNT.USER_ACCOUNT_ID }, true);
public static final ForeignKey<UserAccountRecord, OrgUnitRecord> USER_ACCOUNT__FK_USER_ORG_UNIT_ID = Internal.createForeignKey(UserAccount.USER_ACCOUNT, DSL.name("fk_user_org_unit_id"), new TableField[] { UserAccount.USER_ACCOUNT.ORG_UNIT_ID }, Keys.PK_ORG_UNIT, new TableField[] { OrgUnit.ORG_UNIT.ID }, true);
public static final ForeignKey<UserAccountAdditionInfoRecord, UserAccountRecord> USER_ACCOUNT_ADDITION_INFO__FK_USER_ACCOUNT_ID = Internal.createForeignKey(UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO, DSL.name("fk_user_account_id"), new TableField[] { UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO.USER_ACCOUNT_ID }, Keys.PK_USER, new TableField[] { UserAccount.USER_ACCOUNT.USER_ACCOUNT_ID }, true);
public static final ForeignKey<UserAccountRefreshTokenRecord, UserAccountRecord> USER_ACCOUNT_REFRESH_TOKEN__FK_USER_ACCOUNT_REFRESH_TOKEN = Internal.createForeignKey(UserAccountRefreshToken.USER_ACCOUNT_REFRESH_TOKEN, DSL.name("fk_user_account_refresh_token"), new TableField[] { UserAccountRefreshToken.USER_ACCOUNT_REFRESH_TOKEN.USER_ACCOUNT_ID }, Keys.PK_USER, new TableField[] { UserAccount.USER_ACCOUNT.USER_ACCOUNT_ID }, true);
public static final ForeignKey<UserAccountVerificationRecord, UserAccountRecord> USER_ACCOUNT_VERIFICATION__FK_USER_ACCOUNT_USER_ACCOUNT_VERIFICATION = Internal.createForeignKey(UserAccountVerification.USER_ACCOUNT_VERIFICATION, DSL.name("fk_user_account_user_account_verification"), new TableField[] { UserAccountVerification.USER_ACCOUNT_VERIFICATION.USER_ACCOUNT_ID }, Keys.PK_USER, new TableField[] { UserAccount.USER_ACCOUNT.USER_ACCOUNT_ID }, true);
public static final ForeignKey<UserGroupRecord, AccessLevelRecord> USER_GROUP__FK_USER_GROUP_ACCESS_LEVEL = Internal.createForeignKey(UserGroup.USER_GROUP, DSL.name("fk_user_group_access_level"), new TableField[] { UserGroup.USER_GROUP.ACCESS_LEVEL_ID }, Keys.PK_ACCESS_LEVEL, new TableField[] { AccessLevel.ACCESS_LEVEL.ACCESS_LEVEL_ID }, true);

7
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Security.java
View file

@ -24,7 +24,6 @@ import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnit;
import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnitAdditionalInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.SimpleCredentials;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccount;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountAdditionInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountRefreshToken;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountVerification;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserGroup;
@ -104,11 +103,6 @@ public class Security extends SchemaImpl {
*/
public final UserAccount USER_ACCOUNT = UserAccount.USER_ACCOUNT;
/**
* The table <code>security.user_account_addition_info</code>.
*/
public final UserAccountAdditionInfo USER_ACCOUNT_ADDITION_INFO = UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO;
/**
* The table <code>security.user_account_refresh_token</code>.
*/
@ -157,7 +151,6 @@ public class Security extends SchemaImpl {
OrgUnitAdditionalInfo.ORG_UNIT_ADDITIONAL_INFO,
SimpleCredentials.SIMPLE_CREDENTIALS,
UserAccount.USER_ACCOUNT,
UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO,
UserAccountRefreshToken.USER_ACCOUNT_REFRESH_TOKEN,
UserAccountVerification.USER_ACCOUNT_VERIFICATION,
UserGroup.USER_GROUP,

6
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/Tables.java
View file

@ -16,7 +16,6 @@ import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnit;
import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnitAdditionalInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.SimpleCredentials;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccount;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountAdditionInfo;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountRefreshToken;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountVerification;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserGroup;
@ -89,11 +88,6 @@ public class Tables {
*/
public static final UserAccount USER_ACCOUNT = UserAccount.USER_ACCOUNT;
/**
* The table <code>security.user_account_addition_info</code>.
*/
public static final UserAccountAdditionInfo USER_ACCOUNT_ADDITION_INFO = UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO;
/**
* The table <code>security.user_account_refresh_token</code>.
*/

2
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/LinkUserAccountUserGroup.java
View file

@ -63,7 +63,7 @@ public class LinkUserAccountUserGroup extends TableImpl<LinkUserAccountUserGroup
* The column
* <code>security.link_user_account_user_group.link_user_account_user_group_id</code>.
*/
public final TableField<LinkUserAccountUserGroupRecord, String> LINK_USER_ACCOUNT_USER_GROUP_ID = createField(DSL.name("link_user_account_user_group_id"), SQLDataType.CHAR(36).nullable(false).defaultValue(DSL.field(DSL.raw("uuid_generate_v4()"), SQLDataType.CHAR)), this, "");
public final TableField<LinkUserAccountUserGroupRecord, String> LINK_USER_ACCOUNT_USER_GROUP_ID = createField(DSL.name("link_user_account_user_group_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column

16
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccount.java
View file

@ -36,7 +36,6 @@ import ru.micord.ervu.account_applications.db_beans.security.tables.EsiaUser.Esi
import ru.micord.ervu.account_applications.db_beans.security.tables.LinkUserAccountUserGroup.LinkUserAccountUserGroupPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.OrgUnit.OrgUnitPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.SimpleCredentials.SimpleCredentialsPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountAdditionInfo.UserAccountAdditionInfoPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountRefreshToken.UserAccountRefreshTokenPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountVerification.UserAccountVerificationPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserGroup.UserGroupPath;
@ -67,7 +66,7 @@ public class UserAccount extends TableImpl<UserAccountRecord> {
/**
* The column <code>security.user_account.user_account_id</code>.
*/
public final TableField<UserAccountRecord, String> USER_ACCOUNT_ID = createField(DSL.name("user_account_id"), SQLDataType.CHAR(36).nullable(false).defaultValue(DSL.field(DSL.raw("uuid_generate_v4()"), SQLDataType.CHAR)), this, "");
public final TableField<UserAccountRecord, String> USER_ACCOUNT_ID = createField(DSL.name("user_account_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column <code>security.user_account.email</code>.
@ -265,19 +264,6 @@ public class UserAccount extends TableImpl<UserAccountRecord> {
return _simpleCredentials;
}
private transient UserAccountAdditionInfoPath _userAccountAdditionInfo;
/**
* Get the implicit to-many join path to the
* <code>security.user_account_addition_info</code> table
*/
public UserAccountAdditionInfoPath userAccountAdditionInfo() {
if (_userAccountAdditionInfo == null)
_userAccountAdditionInfo = new UserAccountAdditionInfoPath(this, null, Keys.USER_ACCOUNT_ADDITION_INFO__FK_USER_ACCOUNT_ID.getInverseKey());
return _userAccountAdditionInfo;
}
private transient UserAccountRefreshTokenPath _userAccountRefreshToken;
/**

332
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/UserAccountAdditionInfo.java
View file

@ -1,332 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package ru.micord.ervu.account_applications.db_beans.security.tables;
import java.sql.Date;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
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;
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.security.Keys;
import ru.micord.ervu.account_applications.db_beans.security.Security;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccount.UserAccountPath;
import ru.micord.ervu.account_applications.db_beans.security.tables.records.UserAccountAdditionInfoRecord;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UserAccountAdditionInfo extends TableImpl<UserAccountAdditionInfoRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of
* <code>security.user_account_addition_info</code>
*/
public static final UserAccountAdditionInfo USER_ACCOUNT_ADDITION_INFO = new UserAccountAdditionInfo();
/**
* The class holding records for this type
*/
@Override
public Class<UserAccountAdditionInfoRecord> getRecordType() {
return UserAccountAdditionInfoRecord.class;
}
/**
* The column
* <code>security.user_account_addition_info.user_account_addition_info_id</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, Long> USER_ACCOUNT_ADDITION_INFO_ID = createField(DSL.name("user_account_addition_info_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column
* <code>security.user_account_addition_info.user_account_id</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> USER_ACCOUNT_ID = createField(DSL.name("user_account_id"), SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>security.user_account_addition_info.ip_address</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> IP_ADDRESS = createField(DSL.name("ip_address"), SQLDataType.VARCHAR(100), this, "");
/**
* The column
* <code>security.user_account_addition_info.job_position_id</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, Long> JOB_POSITION_ID = createField(DSL.name("job_position_id"), SQLDataType.BIGINT, this, "");
/**
* The column <code>security.user_account_addition_info.comment</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> COMMENT = createField(DSL.name("comment"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>security.user_account_addition_info.user_loaded</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, Boolean> USER_LOADED = createField(DSL.name("user_loaded"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column <code>security.user_account_addition_info.password</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> PASSWORD = createField(DSL.name("password"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>security.user_account_addition_info.sex</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> SEX = createField(DSL.name("sex"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>security.user_account_addition_info.birth_date</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, Date> BIRTH_DATE = createField(DSL.name("birth_date"), SQLDataType.DATE, this, "");
/**
* The column <code>security.user_account_addition_info.snils</code>.
*/
public final TableField<UserAccountAdditionInfoRecord, String> SNILS = createField(DSL.name("snils"), SQLDataType.VARCHAR, this, "");
private UserAccountAdditionInfo(Name alias, Table<UserAccountAdditionInfoRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private UserAccountAdditionInfo(Name alias, Table<UserAccountAdditionInfoRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>security.user_account_addition_info</code> table
* reference
*/
public UserAccountAdditionInfo(String alias) {
this(DSL.name(alias), USER_ACCOUNT_ADDITION_INFO);
}
/**
* Create an aliased <code>security.user_account_addition_info</code> table
* reference
*/
public UserAccountAdditionInfo(Name alias) {
this(alias, USER_ACCOUNT_ADDITION_INFO);
}
/**
* Create a <code>security.user_account_addition_info</code> table reference
*/
public UserAccountAdditionInfo() {
this(DSL.name("user_account_addition_info"), null);
}
public <O extends Record> UserAccountAdditionInfo(Table<O> path, ForeignKey<O, UserAccountAdditionInfoRecord> childPath, InverseForeignKey<O, UserAccountAdditionInfoRecord> parentPath) {
super(path, childPath, parentPath, USER_ACCOUNT_ADDITION_INFO);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class UserAccountAdditionInfoPath extends UserAccountAdditionInfo implements Path<UserAccountAdditionInfoRecord> {
public <O extends Record> UserAccountAdditionInfoPath(Table<O> path, ForeignKey<O, UserAccountAdditionInfoRecord> childPath, InverseForeignKey<O, UserAccountAdditionInfoRecord> parentPath) {
super(path, childPath, parentPath);
}
private UserAccountAdditionInfoPath(Name alias, Table<UserAccountAdditionInfoRecord> aliased) {
super(alias, aliased);
}
@Override
public UserAccountAdditionInfoPath as(String alias) {
return new UserAccountAdditionInfoPath(DSL.name(alias), this);
}
@Override
public UserAccountAdditionInfoPath as(Name alias) {
return new UserAccountAdditionInfoPath(alias, this);
}
@Override
public UserAccountAdditionInfoPath as(Table<?> alias) {
return new UserAccountAdditionInfoPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : Security.SECURITY;
}
@Override
public Identity<UserAccountAdditionInfoRecord, Long> getIdentity() {
return (Identity<UserAccountAdditionInfoRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<UserAccountAdditionInfoRecord> getPrimaryKey() {
return Keys.PK_USER_ACCOUNT_ADDITION_INFO;
}
@Override
public List<ForeignKey<UserAccountAdditionInfoRecord, ?>> getReferences() {
return Arrays.asList(Keys.USER_ACCOUNT_ADDITION_INFO__FK_USER_ACCOUNT_ID);
}
private transient UserAccountPath _userAccount;
/**
* Get the implicit join path to the <code>security.user_account</code>
* table.
*/
public UserAccountPath userAccount() {
if (_userAccount == null)
_userAccount = new UserAccountPath(this, Keys.USER_ACCOUNT_ADDITION_INFO__FK_USER_ACCOUNT_ID, null);
return _userAccount;
}
@Override
public UserAccountAdditionInfo as(String alias) {
return new UserAccountAdditionInfo(DSL.name(alias), this);
}
@Override
public UserAccountAdditionInfo as(Name alias) {
return new UserAccountAdditionInfo(alias, this);
}
@Override
public UserAccountAdditionInfo as(Table<?> alias) {
return new UserAccountAdditionInfo(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public UserAccountAdditionInfo rename(String name) {
return new UserAccountAdditionInfo(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public UserAccountAdditionInfo rename(Name name) {
return new UserAccountAdditionInfo(name, null);
}
/**
* Rename this table
*/
@Override
public UserAccountAdditionInfo rename(Table<?> name) {
return new UserAccountAdditionInfo(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo where(Condition condition) {
return new UserAccountAdditionInfo(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public UserAccountAdditionInfo where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public UserAccountAdditionInfo where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public UserAccountAdditionInfo where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public UserAccountAdditionInfo where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public UserAccountAdditionInfo whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

207
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/security/tables/records/UserAccountAdditionInfoRecord.java
View file

@ -1,207 +0,0 @@
/*
* This file is generated by jOOQ.
*/
package ru.micord.ervu.account_applications.db_beans.security.tables.records;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
import ru.micord.ervu.account_applications.db_beans.security.tables.UserAccountAdditionInfo;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UserAccountAdditionInfoRecord extends UpdatableRecordImpl<UserAccountAdditionInfoRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for
* <code>security.user_account_addition_info.user_account_addition_info_id</code>.
*/
public void setUserAccountAdditionInfoId(Long value) {
set(0, value);
}
/**
* Getter for
* <code>security.user_account_addition_info.user_account_addition_info_id</code>.
*/
public Long getUserAccountAdditionInfoId() {
return (Long) get(0);
}
/**
* Setter for
* <code>security.user_account_addition_info.user_account_id</code>.
*/
public void setUserAccountId(String value) {
set(1, value);
}
/**
* Getter for
* <code>security.user_account_addition_info.user_account_id</code>.
*/
public String getUserAccountId() {
return (String) get(1);
}
/**
* Setter for <code>security.user_account_addition_info.ip_address</code>.
*/
public void setIpAddress(String value) {
set(2, value);
}
/**
* Getter for <code>security.user_account_addition_info.ip_address</code>.
*/
public String getIpAddress() {
return (String) get(2);
}
/**
* Setter for
* <code>security.user_account_addition_info.job_position_id</code>.
*/
public void setJobPositionId(Long value) {
set(3, value);
}
/**
* Getter for
* <code>security.user_account_addition_info.job_position_id</code>.
*/
public Long getJobPositionId() {
return (Long) get(3);
}
/**
* Setter for <code>security.user_account_addition_info.comment</code>.
*/
public void setComment(String value) {
set(4, value);
}
/**
* Getter for <code>security.user_account_addition_info.comment</code>.
*/
public String getComment() {
return (String) get(4);
}
/**
* Setter for <code>security.user_account_addition_info.user_loaded</code>.
*/
public void setUserLoaded(Boolean value) {
set(5, value);
}
/**
* Getter for <code>security.user_account_addition_info.user_loaded</code>.
*/
public Boolean getUserLoaded() {
return (Boolean) get(5);
}
/**
* Setter for <code>security.user_account_addition_info.password</code>.
*/
public void setPassword(String value) {
set(6, value);
}
/**
* Getter for <code>security.user_account_addition_info.password</code>.
*/
public String getPassword() {
return (String) get(6);
}
/**
* Setter for <code>security.user_account_addition_info.sex</code>.
*/
public void setSex(String value) {
set(7, value);
}
/**
* Getter for <code>security.user_account_addition_info.sex</code>.
*/
public String getSex() {
return (String) get(7);
}
/**
* Setter for <code>security.user_account_addition_info.birth_date</code>.
*/
public void setBirthDate(Date value) {
set(8, value);
}
/**
* Getter for <code>security.user_account_addition_info.birth_date</code>.
*/
public Date getBirthDate() {
return (Date) get(8);
}
/**
* Setter for <code>security.user_account_addition_info.snils</code>.
*/
public void setSnils(String value) {
set(9, value);
}
/**
* Getter for <code>security.user_account_addition_info.snils</code>.
*/
public String getSnils() {
return (String) get(9);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached UserAccountAdditionInfoRecord
*/
public UserAccountAdditionInfoRecord() {
super(UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO);
}
/**
* Create a detached, initialised UserAccountAdditionInfoRecord
*/
public UserAccountAdditionInfoRecord(Long userAccountAdditionInfoId, String userAccountId, String ipAddress, Long jobPositionId, String comment, Boolean userLoaded, String password, String sex, Date birthDate, String snils) {
super(UserAccountAdditionInfo.USER_ACCOUNT_ADDITION_INFO);
setUserAccountAdditionInfoId(userAccountAdditionInfoId);
setUserAccountId(userAccountId);
setIpAddress(ipAddress);
setJobPositionId(jobPositionId);
setComment(comment);
setUserLoaded(userLoaded);
setPassword(password);
setSex(sex);
setBirthDate(birthDate);
setSnils(snils);
resetChangedOnNotNull();
}
}

10
config/db.env
View file

@ -1,20 +1,20 @@
# App datasource
DB_APP_USERNAME=ervu
DB_APP_PASSWORD=ervu_password
DB_APP_USERNAME=ervu_account_applications
DB_APP_PASSWORD=ervu_account_applications
DB_APP_HOST=db
DB_APP_PORT=5432
DB_APP_NAME=account_applications
# Security datasource
DB_SEC_USERNAME=ervu
DB_SEC_PASSWORD=ervu_password
DB_SEC_USERNAME=ervu_account_applications
DB_SEC_PASSWORD=ervu_account_applications
DB_SEC_HOST=db
DB_SEC_PORT=5432
DB_SEC_NAME=account_applications
# jBPM datasorce
DB_JBPM_USERNAME=ervu_jbpm
DB_JBPM_PASSWORD=ervu_jbpm_password
DB_JBPM_PASSWORD=ervu_jbpm
DB_JBPM_HOST=db
DB_JBPM_PORT=5432
DB_JBPM_NAME=account_applications_jbpm

4
config/initdb.d/01_createdb.sql
View file

@ -5,7 +5,7 @@ CREATE ROLE ervu_account_applications WITH
NOCREATEDB
NOCREATEROLE
NOREPLICATION
PASSWORD 'ervu_password';
PASSWORD 'ervu_account_applications';
CREATE ROLE ervu_jbpm WITH
LOGIN
@ -14,7 +14,7 @@ CREATE ROLE ervu_jbpm WITH
NOCREATEDB
NOCREATEROLE
NOREPLICATION
PASSWORD 'ervu_jbpm_password';
PASSWORD 'ervu_jbpm';
CREATE DATABASE account_applications

1198
config/initdb.d/02_account_applications.sql
View file

File diff suppressed because one or more lines are too long

4
config/micord.env
View file

@ -3,11 +3,11 @@ DB_APP_USERNAME=ervu_account_applications
DB_APP_PASSWORD=ervu_account_applications
DB_APP_HOST=10.10.31.118
DB_APP_PORT=5432
DB_APP_NAME=ervu_account_applications
DB_APP_NAME=account_applications
# Security datasource
DB_SEC_USERNAME=ervu_account_applications
DB_SEC_PASSWORD=ervu_account_applications
DB_SEC_HOST=10.10.31.118
DB_SEC_PORT=5432
DB_SEC_NAME=ervu_account_applications
DB_SEC_NAME=account_applications

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

@ -913,6 +913,240 @@
<simple>"NOT_EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="936a09f5-1138-420e-86cc-44ddc5767a7d" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>group</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="6d5051f1-dfad-45bd-8baa-da7d0599dcfe" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"LOGIN_PASSWORD_ISSUED"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="f68ae385-1574-4d52-9d84-aedf36503ce6" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"UNLOADED"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="0a8312b8-a2fd-4a78-883b-efe9fa25d6ea" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"ACCEPTED"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"OR"</simple>
</value>
</entry>
</complex>
</value>
</entry>
@ -2178,6 +2412,12 @@
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
@ -3439,6 +3679,12 @@
<simple>"Примечание"</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
@ -3807,231 +4053,7 @@
<componentRootId>f71bca09-bcd8-44be-971b-1be9271212c0</componentRootId>
<name>AC_отмена под создателем</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>elseActions</key>
<value>
<item id="eb2297a1-9398-4ca5-ad2c-8efb46bdea6c" removed="true"/>
</value>
</entry>
<entry>
<key>eventRefs</key>
<value>
<item id="27523fc6-fc5f-44ad-85a3-5dce2a6263b5" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"80f94647-9cb4-4aaf-8c6b-a842e486e98c","packageName":"component.container","className":"Form","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"formLoaded"</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="2e002fb3-310a-401a-a6db-e5dfa182f1a1" removed="true"/>
<item id="0c784fde-6d51-4bda-a915-9600e56d2008" removed="true"/>
<item id="33776b8c-ff5e-4b09-9b65-571727320928" removed="true"/>
<item id="9e2e665b-48e5-498f-88b6-31d03cf746b8" removed="true"/>
<item id="7212f22f-9c5a-41af-bf4b-57186917f494" removed="true"/>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="6bb7b6da-d6c1-4fef-a0e7-3f73626d185e" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Ответственный за ЗИ"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"hasRole"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="0bb88bf8-f0be-4b57-87e5-f29931ce3a9d" removed="true"/>
<item id="988335b4-420c-421d-967a-979c59f88f63" removed="true"/>
<item id="5019f430-c86b-4af3-8c47-ce1357ed69dd" removed="true"/>
<item id="5f6d5f4e-104d-4f3b-af3a-3d78ccaa74d8" removed="true"/>
<item id="0250b46f-20c1-422f-9cad-65d31818f989" removed="true"/>
<item id="7d0d2e10-f960-4c04-b9eb-8a106acae7be" removed="true"/>
<item id="21911535-2794-4c9b-8411-a163ee3e97a0" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="849fcfa0-a2f3-4aff-9952-edc8e4b84cb7" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"34694f84-8795-482b-a1d0-d09a31c82c30","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"CANCEL_BY_CREATOR"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="d6d94d10-f946-4014-af86-eecdfdbe879a" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"af94da3d-7ff2-4ffc-b520-5c5a7816f889","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setCaption"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"Отменить"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="f44fe743-6e8c-404f-b3b6-6160ca28e69b" removed="true"/>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="38792412-55b2-4cd7-a940-158be55b3e3b">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
@ -4044,6 +4066,41 @@
<entry>
<key>elseActions</key>
<value>
<item id="2ea335a2-5997-4446-b9cc-ee90a7e3c1cb" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d2ca772f-607c-408e-af32-f48d4f8b54e3","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="32047593-b33d-4a96-b55f-2c681a83d7a2" removed="true"/>
<item id="eb2297a1-9398-4ca5-ad2c-8efb46bdea6c" removed="true"/>
</value>
@ -4297,7 +4354,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"af94da3d-7ff2-4ffc-b520-5c5a7816f889","packageName":"component.button","className":"Button","type":"TS"}</simple>
<simple>{"objectId":"d2ca772f-607c-408e-af32-f48d4f8b54e3","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4336,7 +4393,7 @@
<children id="26895546-5020-45be-bb2c-285b9b4134a0">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>26895546-5020-45be-bb2c-285b9b4134a0</componentRootId>
<name>AC_отмена под согласователем</name>
<name>AC_отклонить под согласователем</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
@ -4830,7 +4887,7 @@
<children id="3b2ca5d6-006f-4ae8-88d9-ab7f864c2822">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>3b2ca5d6-006f-4ae8-88d9-ab7f864c2822</componentRootId>
<name>AC_отмена под админом</name>
<name>AC_отклонить под админом</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
@ -5975,6 +6032,74 @@
<simple>"EQUALS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="7d1d666e-af53-4ee2-a3d7-16523b7a1ee7" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"REJECT"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"STARTS_WITH"</simple>
</value>
</entry>
</complex>
</value>
</entry>
@ -8630,6 +8755,35 @@
</properties>
</scripts>
</children>
<children id="d2ca772f-607c-408e-af32-f48d4f8b54e3">
<prototypeId>fd7e47b9-dce1-4d14-9f3a-580c79f59579</prototypeId>
<componentRootId>d2ca772f-607c-408e-af32-f48d4f8b54e3</componentRootId>
<name>Button Отменить</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>caption</key>
<value>
<simple>"Отменить"</simple>
</value>
</entry>
<entry>
<key>confirmationText</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="af94da3d-7ff2-4ffc-b520-5c5a7816f889">
<prototypeId>fd7e47b9-dce1-4d14-9f3a-580c79f59579</prototypeId>
<componentRootId>af94da3d-7ff2-4ffc-b520-5c5a7816f889</componentRootId>
@ -9092,74 +9246,7 @@
</complex>
</value>
</item>
<item id="c9c1d203-025e-4c94-9f8b-1d25bde5e8f5" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"CANCEL"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"DOES_NOT_CONTAIN"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="c9c1d203-025e-4c94-9f8b-1d25bde5e8f5" removed="true"/>
<item id="a7725493-5157-4881-96a2-f949e863e958" removed="false">
<value>
<complex>
@ -9502,7 +9589,7 @@
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"CANCEL"</simple>
<simple>"REJECT"</simple>
</value>
</entry>
</complex>
@ -9806,6 +9893,76 @@
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="db86fb9c-455b-4d83-bce8-47bdbcdd8757" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d2ca772f-607c-408e-af32-f48d4f8b54e3","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="43d956fe-25be-494a-8b86-7c27e92d5af9" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"90961d84-b7e6-4b18-b51f-1cc07d2acf09","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
@ -9824,6 +9981,117 @@
</properties>
</scripts>
</children>
<children id="52611e59-43a1-4cae-b364-a285099a79c3">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>52611e59-43a1-4cae-b364-a285099a79c3</componentRootId>
<name>AC_отменить</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="de1b2b9e-6ceb-4db8-ab1f-a492199171c7" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d2ca772f-607c-408e-af32-f48d4f8b54e3","packageName":"component.button","className":"Button","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"clickEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="fbfd7d31-738b-422e-a23c-fba1878e249b" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"CANCEL_BY_CREATOR"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="361a327e-26a5-4319-a658-2630ebf31ea6" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"dd6db966-9599-4483-9eae-12718b7f081b","packageName":"component.button","className":"SaveButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"onClick"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="85ec8ffc-5684-43a5-8274-0dc08109c3e0">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>85ec8ffc-5684-43a5-8274-0dc08109c3e0</componentRootId>

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

@ -2285,12 +2285,6 @@
<simple>"Выберите файл"</simple>
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74"/>

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

@ -2318,12 +2318,6 @@
<simple>"Выберите файл"</simple>
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74"/>

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

@ -1545,6 +1545,7 @@
<componentRootId>6a35687d-bbb6-4094-86c8-2f414a1ca1e7</componentRootId>
<name>Vbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2390,12 +2391,6 @@
<simple>"Выберите файл"</simple>
</value>
</entry>
<entry>
<key>required</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74"/>

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

@ -2112,7 +2112,7 @@
<entry>
<key>width</key>
<value>
<simple>"50%"</simple>
<simple>"55%"</simple>
</value>
</entry>
</complex>
@ -2187,6 +2187,11 @@
<entry>
<key>cssClasses</key>
<value>
<item id="6a24b57d-896d-4610-af53-cf588c823bab" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
<item id="f10da8e6-7712-4f46-aa77-484207018a7a" removed="true"/>
<item id="4f050c1d-755d-4245-94dc-44c2705e41cc" removed="true"/>
</value>
@ -2245,7 +2250,7 @@
<entry>
<key>width</key>
<value>
<simple>"50%"</simple>
<simple>"45%"</simple>
</value>
</entry>
</complex>
@ -2270,7 +2275,12 @@
<value>
<item id="f5d53af6-c043-4883-b437-bbc7fd09ff2f">
<value>
<simple>"free-label"</simple>
<simple>"width-full"</simple>
</value>
</item>
<item id="9da35600-ec38-41ef-89e3-ac5d0a1ca220" removed="false">
<value>
<simple>"fixed-label-extra-mini"</simple>
</value>
</item>
<item id="c06d81a8-1812-4d87-82b5-abc7c319c6b5" removed="true"/>
@ -2323,7 +2333,12 @@
<value>
<item id="668e2ef7-db2e-40e7-8c8d-fadf3271b3b3" removed="false">
<value>
<simple>"free-label"</simple>
<simple>"width-full"</simple>
</value>
</item>
<item id="94e3d426-2392-46ff-b640-5637d1191a1c" removed="false">
<value>
<simple>"fixed-label-extra-mini"</simple>
</value>
</item>
<item id="a0056cdd-49e4-4045-bcf9-49adf02010f9" removed="true"/>
@ -2433,7 +2448,6 @@
<componentRootId>cd396279-39e3-459f-a8b6-af9894753da7</componentRootId>
<name>Vbox</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2722,9 +2736,10 @@
<entry>
<key>cssClasses</key>
<value>
<item id="1ddd53b5-445e-4f84-9504-843bbdd1cda7" removed="false">
<item id="1ddd53b5-445e-4f84-9504-843bbdd1cda7" removed="true"/>
<item id="9ce414a6-213c-4a95-8a62-c986417fa4e2" removed="false">
<value>
<simple>"small"</simple>
<simple>"width-full"</simple>
</value>
</item>
</value>
@ -2914,6 +2929,11 @@
<simple>"width-full"</simple>
</value>
</item>
<item id="443678ad-2b92-49a6-ac79-607d0585cd09" removed="false">
<value>
<simple>"fixed-label-mini"</simple>
</value>
</item>
</value>
</entry>
<entry>
@ -2971,6 +2991,11 @@
<simple>"width-full"</simple>
</value>
</item>
<item id="7529badb-3287-45f7-8fb0-dc4a014f1ca2" removed="false">
<value>
<simple>"fixed-label-mini"</simple>
</value>
</item>
</value>
</entry>
<entry>
@ -3034,6 +3059,11 @@
<simple>"width-full"</simple>
</value>
</item>
<item id="3c33afa0-5d48-44ae-829a-53060cf94682" removed="false">
<value>
<simple>"fixed-label-mini"</simple>
</value>
</item>
</value>
</entry>
<entry>
@ -3092,6 +3122,16 @@
<entry>
<key>cssClasses</key>
<value>
<item id="9e925036-1806-480a-84ac-dcc529ac0f87" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
<item id="cada5ecf-3393-43a2-8433-e2eb26dab248" removed="false">
<value>
<simple>"fixed-label-mini"</simple>
</value>
</item>
<item id="1a16ae5c-0710-4962-86eb-53a051e81675" removed="true"/>
<item id="b18538d4-fdd2-4728-99cf-8f54db5593a1" removed="true"/>
</value>
@ -15851,7 +15891,7 @@
<entry>
<key>title</key>
<value>
<simple>"Карточка выдачи логина и пароля сформирована? Необходимо перевести заявку в статус \"Выдан логин и пароль\""</simple>
<simple>"Карточка выдачи логина и пароля сформирована? Необходимо перевести заявку в статус \"Выдана карточка\""</simple>
</value>
</entry>
</properties>