diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java b/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java index e8971601..8ac58309 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java @@ -15,13 +15,13 @@ public class EnumColumnFormatter implements Formatter { static { strObjectToStringMapping.put("CREATED", "Новая"); strObjectToStringMapping.put("AGREED", "Согласована"); - strObjectToStringMapping.put("ACCEPTED", "Выполнена"); + strObjectToStringMapping.put("ACCEPTED", "Исполнена"); strObjectToStringMapping.put("UNLOADED", "Выгружена"); strObjectToStringMapping.put("IN_PROGRESS", "В работе"); - strObjectToStringMapping.put("LOGIN_PASSWORD_ISSUED", "Выдан логин и пароль"); - strObjectToStringMapping.put("CANCEL_BY_CREATOR", "Отклонена"); - strObjectToStringMapping.put("CANCEL_BY_PROCESSOR", "Отклонена"); - strObjectToStringMapping.put("CANCEL_BY_AGREEER", "Отклонена"); + strObjectToStringMapping.put("LOGIN_PASSWORD_ISSUED", "Выдана карточка"); + strObjectToStringMapping.put("CANCEL_BY_CREATOR", "Отменена"); + strObjectToStringMapping.put("REJECT_BY_PROCESSOR", "Отклонена"); + strObjectToStringMapping.put("REJECT_BY_AGREEER", "Отклонена"); strObjectToStringMapping.put("CREATE_USER", "Создание пользователя"); strObjectToStringMapping.put("EDIT_USER", "Изменение пользователя"); strObjectToStringMapping.put("BLOCK_USER", "Блокировка пользователя"); diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java index 1b894538..5fb37da7 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Keys.java @@ -10,11 +10,13 @@ import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangeloglock; import ru.micord.ervu.account_applications.db_beans.public_.tables.JobPosition; import ru.micord.ervu.account_applications.db_beans.public_.tables.LinkUserApplicationUserGroup; import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment; import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument; import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList; +import ru.micord.ervu.account_applications.db_beans.public_.tables.records.DatabasechangeloglockRecord; import ru.micord.ervu.account_applications.db_beans.public_.tables.records.JobPositionRecord; import ru.micord.ervu.account_applications.db_beans.public_.tables.records.LinkUserApplicationUserGroupRecord; import ru.micord.ervu.account_applications.db_beans.public_.tables.records.RecruitmentRecord; @@ -35,6 +37,7 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- + public static final UniqueKey DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); public static final UniqueKey PK_JOB_POSITION = Internal.createUniqueKey(JobPosition.JOB_POSITION, DSL.name("pk_job_position"), new TableField[] { JobPosition.JOB_POSITION.JOB_POSITION_ID }, true); public static final UniqueKey PK_LINK_USER_APPLICATION_USER_GROUP = Internal.createUniqueKey(LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP, DSL.name("pk_link_user_application_user_group"), new TableField[] { LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP.LINK_USER_APPLICATION_USER_GROUP_ID }, true); public static final UniqueKey UNI_USER_GROUP = Internal.createUniqueKey(LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP, DSL.name("uni_user_group"), new TableField[] { LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP.USER_APPLICATION_LIST_ID, LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP.USER_GROUP_ID }, true); diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java index 74b99333..90f027b5 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java @@ -13,6 +13,8 @@ import org.jooq.Table; import org.jooq.impl.SchemaImpl; import ru.micord.ervu.account_applications.db_beans.DefaultCatalog; +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangelog; +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangeloglock; import ru.micord.ervu.account_applications.db_beans.public_.tables.JobPosition; import ru.micord.ervu.account_applications.db_beans.public_.tables.LinkUserApplicationUserGroup; import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment; @@ -33,6 +35,16 @@ public class Public extends SchemaImpl { */ public static final Public PUBLIC = new Public(); + /** + * The table public.databasechangelog. + */ + public final Databasechangelog DATABASECHANGELOG = Databasechangelog.DATABASECHANGELOG; + + /** + * The table public.databasechangeloglock. + */ + public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** * The table public.job_position. */ @@ -81,6 +93,8 @@ public class Public extends SchemaImpl { @Override public final List> getTables() { return Arrays.asList( + Databasechangelog.DATABASECHANGELOG, + Databasechangeloglock.DATABASECHANGELOGLOCK, JobPosition.JOB_POSITION, LinkUserApplicationUserGroup.LINK_USER_APPLICATION_USER_GROUP, Recruitment.RECRUITMENT, diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java index 2b8329db..0e6305ca 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java @@ -4,6 +4,8 @@ package ru.micord.ervu.account_applications.db_beans.public_; +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangelog; +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangeloglock; import ru.micord.ervu.account_applications.db_beans.public_.tables.JobPosition; import ru.micord.ervu.account_applications.db_beans.public_.tables.LinkUserApplicationUserGroup; import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment; @@ -17,6 +19,16 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicati @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table public.databasechangelog. + */ + public static final Databasechangelog DATABASECHANGELOG = Databasechangelog.DATABASECHANGELOG; + + /** + * The table public.databasechangeloglock. + */ + public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** * The table public.job_position. */ diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangelog.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangelog.java new file mode 100644 index 00000000..028009ad --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangelog.java @@ -0,0 +1,277 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu.account_applications.db_beans.public_.tables; + + +import java.sql.Timestamp; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +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.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + +import ru.micord.ervu.account_applications.db_beans.public_.Public; +import ru.micord.ervu.account_applications.db_beans.public_.tables.records.DatabasechangelogRecord; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Databasechangelog extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.databasechangelog + */ + public static final Databasechangelog DATABASECHANGELOG = new Databasechangelog(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DatabasechangelogRecord.class; + } + + /** + * The column public.databasechangelog.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column public.databasechangelog.author. + */ + public final TableField AUTHOR = createField(DSL.name("author"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column public.databasechangelog.filename. + */ + public final TableField FILENAME = createField(DSL.name("filename"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column public.databasechangelog.dateexecuted. + */ + public final TableField DATEEXECUTED = createField(DSL.name("dateexecuted"), SQLDataType.TIMESTAMP(0).nullable(false), this, ""); + + /** + * The column public.databasechangelog.orderexecuted. + */ + public final TableField ORDEREXECUTED = createField(DSL.name("orderexecuted"), SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column public.databasechangelog.exectype. + */ + public final TableField EXECTYPE = createField(DSL.name("exectype"), SQLDataType.VARCHAR(10).nullable(false), this, ""); + + /** + * The column public.databasechangelog.md5sum. + */ + public final TableField MD5SUM = createField(DSL.name("md5sum"), SQLDataType.VARCHAR(35), this, ""); + + /** + * The column public.databasechangelog.description. + */ + public final TableField DESCRIPTION = createField(DSL.name("description"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column public.databasechangelog.comments. + */ + public final TableField COMMENTS = createField(DSL.name("comments"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column public.databasechangelog.tag. + */ + public final TableField TAG = createField(DSL.name("tag"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column public.databasechangelog.liquibase. + */ + public final TableField LIQUIBASE = createField(DSL.name("liquibase"), SQLDataType.VARCHAR(20), this, ""); + + /** + * The column public.databasechangelog.contexts. + */ + public final TableField CONTEXTS = createField(DSL.name("contexts"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column public.databasechangelog.labels. + */ + public final TableField LABELS = createField(DSL.name("labels"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column public.databasechangelog.deployment_id. + */ + public final TableField DEPLOYMENT_ID = createField(DSL.name("deployment_id"), SQLDataType.VARCHAR(10), this, ""); + + private Databasechangelog(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Databasechangelog(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.databasechangelog table reference + */ + public Databasechangelog(String alias) { + this(DSL.name(alias), DATABASECHANGELOG); + } + + /** + * Create an aliased public.databasechangelog table reference + */ + public Databasechangelog(Name alias) { + this(alias, DATABASECHANGELOG); + } + + /** + * Create a public.databasechangelog table reference + */ + public Databasechangelog() { + this(DSL.name("databasechangelog"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public Databasechangelog as(String alias) { + return new Databasechangelog(DSL.name(alias), this); + } + + @Override + public Databasechangelog as(Name alias) { + return new Databasechangelog(alias, this); + } + + @Override + public Databasechangelog as(Table alias) { + return new Databasechangelog(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Databasechangelog rename(String name) { + return new Databasechangelog(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Databasechangelog rename(Name name) { + return new Databasechangelog(name, null); + } + + /** + * Rename this table + */ + @Override + public Databasechangelog rename(Table name) { + return new Databasechangelog(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog where(Condition condition) { + return new Databasechangelog(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangelog where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangelog where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangelog where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangelog where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangelog whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangeloglock.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangeloglock.java new file mode 100644 index 00000000..5ecdb3c8 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/Databasechangeloglock.java @@ -0,0 +1,236 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu.account_applications.db_beans.public_.tables; + + +import java.sql.Timestamp; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + +import ru.micord.ervu.account_applications.db_beans.public_.Keys; +import ru.micord.ervu.account_applications.db_beans.public_.Public; +import ru.micord.ervu.account_applications.db_beans.public_.tables.records.DatabasechangeloglockRecord; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Databasechangeloglock extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.databasechangeloglock + */ + public static final Databasechangeloglock DATABASECHANGELOGLOCK = new Databasechangeloglock(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DatabasechangeloglockRecord.class; + } + + /** + * The column public.databasechangeloglock.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column public.databasechangeloglock.locked. + */ + public final TableField LOCKED = createField(DSL.name("locked"), SQLDataType.BOOLEAN.nullable(false), this, ""); + + /** + * The column public.databasechangeloglock.lockgranted. + */ + public final TableField LOCKGRANTED = createField(DSL.name("lockgranted"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.databasechangeloglock.lockedby. + */ + public final TableField LOCKEDBY = createField(DSL.name("lockedby"), SQLDataType.VARCHAR(255), this, ""); + + private Databasechangeloglock(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Databasechangeloglock(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.databasechangeloglock table + * reference + */ + public Databasechangeloglock(String alias) { + this(DSL.name(alias), DATABASECHANGELOGLOCK); + } + + /** + * Create an aliased public.databasechangeloglock table + * reference + */ + public Databasechangeloglock(Name alias) { + this(alias, DATABASECHANGELOGLOCK); + } + + /** + * Create a public.databasechangeloglock table reference + */ + public Databasechangeloglock() { + this(DSL.name("databasechangeloglock"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.DATABASECHANGELOGLOCK_PKEY; + } + + @Override + public Databasechangeloglock as(String alias) { + return new Databasechangeloglock(DSL.name(alias), this); + } + + @Override + public Databasechangeloglock as(Name alias) { + return new Databasechangeloglock(alias, this); + } + + @Override + public Databasechangeloglock as(Table alias) { + return new Databasechangeloglock(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Databasechangeloglock rename(String name) { + return new Databasechangeloglock(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Databasechangeloglock rename(Name name) { + return new Databasechangeloglock(name, null); + } + + /** + * Rename this table + */ + @Override + public Databasechangeloglock rename(Table name) { + return new Databasechangeloglock(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock where(Condition condition) { + return new Databasechangeloglock(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangeloglock where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangeloglock where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangeloglock where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Databasechangeloglock where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Databasechangeloglock whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangelogRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangelogRecord.java new file mode 100644 index 00000000..905b0d62 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangelogRecord.java @@ -0,0 +1,251 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu.account_applications.db_beans.public_.tables.records; + + +import java.sql.Timestamp; + +import org.jooq.impl.TableRecordImpl; + +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangelog; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DatabasechangelogRecord extends TableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.databasechangelog.id. + */ + public void setId(String value) { + set(0, value); + } + + /** + * Getter for public.databasechangelog.id. + */ + public String getId() { + return (String) get(0); + } + + /** + * Setter for public.databasechangelog.author. + */ + public void setAuthor(String value) { + set(1, value); + } + + /** + * Getter for public.databasechangelog.author. + */ + public String getAuthor() { + return (String) get(1); + } + + /** + * Setter for public.databasechangelog.filename. + */ + public void setFilename(String value) { + set(2, value); + } + + /** + * Getter for public.databasechangelog.filename. + */ + public String getFilename() { + return (String) get(2); + } + + /** + * Setter for public.databasechangelog.dateexecuted. + */ + public void setDateexecuted(Timestamp value) { + set(3, value); + } + + /** + * Getter for public.databasechangelog.dateexecuted. + */ + public Timestamp getDateexecuted() { + return (Timestamp) get(3); + } + + /** + * Setter for public.databasechangelog.orderexecuted. + */ + public void setOrderexecuted(Integer value) { + set(4, value); + } + + /** + * Getter for public.databasechangelog.orderexecuted. + */ + public Integer getOrderexecuted() { + return (Integer) get(4); + } + + /** + * Setter for public.databasechangelog.exectype. + */ + public void setExectype(String value) { + set(5, value); + } + + /** + * Getter for public.databasechangelog.exectype. + */ + public String getExectype() { + return (String) get(5); + } + + /** + * Setter for public.databasechangelog.md5sum. + */ + public void setMd5sum(String value) { + set(6, value); + } + + /** + * Getter for public.databasechangelog.md5sum. + */ + public String getMd5sum() { + return (String) get(6); + } + + /** + * Setter for public.databasechangelog.description. + */ + public void setDescription(String value) { + set(7, value); + } + + /** + * Getter for public.databasechangelog.description. + */ + public String getDescription() { + return (String) get(7); + } + + /** + * Setter for public.databasechangelog.comments. + */ + public void setComments(String value) { + set(8, value); + } + + /** + * Getter for public.databasechangelog.comments. + */ + public String getComments() { + return (String) get(8); + } + + /** + * Setter for public.databasechangelog.tag. + */ + public void setTag(String value) { + set(9, value); + } + + /** + * Getter for public.databasechangelog.tag. + */ + public String getTag() { + return (String) get(9); + } + + /** + * Setter for public.databasechangelog.liquibase. + */ + public void setLiquibase(String value) { + set(10, value); + } + + /** + * Getter for public.databasechangelog.liquibase. + */ + public String getLiquibase() { + return (String) get(10); + } + + /** + * Setter for public.databasechangelog.contexts. + */ + public void setContexts(String value) { + set(11, value); + } + + /** + * Getter for public.databasechangelog.contexts. + */ + public String getContexts() { + return (String) get(11); + } + + /** + * Setter for public.databasechangelog.labels. + */ + public void setLabels(String value) { + set(12, value); + } + + /** + * Getter for public.databasechangelog.labels. + */ + public String getLabels() { + return (String) get(12); + } + + /** + * Setter for public.databasechangelog.deployment_id. + */ + public void setDeploymentId(String value) { + set(13, value); + } + + /** + * Getter for public.databasechangelog.deployment_id. + */ + public String getDeploymentId() { + return (String) get(13); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DatabasechangelogRecord + */ + public DatabasechangelogRecord() { + super(Databasechangelog.DATABASECHANGELOG); + } + + /** + * Create a detached, initialised DatabasechangelogRecord + */ + public DatabasechangelogRecord(String id, String author, String filename, Timestamp dateexecuted, Integer orderexecuted, String exectype, String md5sum, String description, String comments, String tag, String liquibase, String contexts, String labels, String deploymentId) { + super(Databasechangelog.DATABASECHANGELOG); + + setId(id); + setAuthor(author); + setFilename(filename); + setDateexecuted(dateexecuted); + setOrderexecuted(orderexecuted); + setExectype(exectype); + setMd5sum(md5sum); + setDescription(description); + setComments(comments); + setTag(tag); + setLiquibase(liquibase); + setContexts(contexts); + setLabels(labels); + setDeploymentId(deploymentId); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangeloglockRecord.java b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangeloglockRecord.java new file mode 100644 index 00000000..24f40372 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/DatabasechangeloglockRecord.java @@ -0,0 +1,111 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu.account_applications.db_beans.public_.tables.records; + + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + +import ru.micord.ervu.account_applications.db_beans.public_.tables.Databasechangeloglock; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DatabasechangeloglockRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.databasechangeloglock.id. + */ + public void setId(Integer value) { + set(0, value); + } + + /** + * Getter for public.databasechangeloglock.id. + */ + public Integer getId() { + return (Integer) get(0); + } + + /** + * Setter for public.databasechangeloglock.locked. + */ + public void setLocked(Boolean value) { + set(1, value); + } + + /** + * Getter for public.databasechangeloglock.locked. + */ + public Boolean getLocked() { + return (Boolean) get(1); + } + + /** + * Setter for public.databasechangeloglock.lockgranted. + */ + public void setLockgranted(Timestamp value) { + set(2, value); + } + + /** + * Getter for public.databasechangeloglock.lockgranted. + */ + public Timestamp getLockgranted() { + return (Timestamp) get(2); + } + + /** + * Setter for public.databasechangeloglock.lockedby. + */ + public void setLockedby(String value) { + set(3, value); + } + + /** + * Getter for public.databasechangeloglock.lockedby. + */ + public String getLockedby() { + return (String) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DatabasechangeloglockRecord + */ + public DatabasechangeloglockRecord() { + super(Databasechangeloglock.DATABASECHANGELOGLOCK); + } + + /** + * Create a detached, initialised DatabasechangeloglockRecord + */ + public DatabasechangeloglockRecord(Integer id, Boolean locked, Timestamp lockgranted, String lockedby) { + super(Databasechangeloglock.DATABASECHANGELOGLOCK); + + setId(id); + setLocked(locked); + setLockgranted(lockgranted); + setLockedby(lockedby); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page index 96c5fb18..2fb68635 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page @@ -26,7 +26,6 @@ bfe23489-f84c-4a83-ac19-7f6a7ff72a19 Vbox_85% true - false false @@ -133,41 +132,7 @@ elseActions - - - - - behavior - - {"objectId":"f89e8996-7a75-437a-b2f7-68281199f46e","packageName":"component.field","className":"TextField","type":"TS"} - - - - method - - "setVisible" - - - - value - - - - staticValue - - - boolean - - -false - - - - - - - - + @@ -268,6 +233,7 @@ + @@ -317,41 +283,7 @@ - - - - - behavior - - {"objectId":"f89e8996-7a75-437a-b2f7-68281199f46e","packageName":"component.field","className":"TextField","type":"TS"} - - - - method - - "setVisible" - - - - value - - - - staticValue - - - boolean - - -true - - - - - - - - + @@ -750,6 +682,294 @@ + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 56b459b1-25ae-46fa-9bc0-8f85d69ec786 + AC_CREATE_USER_пароль_видимость + false + false + + + + elseActions + + + + + + behavior + + {"objectId":"f89e8996-7a75-437a-b2f7-68281199f46e","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +false + + + + + + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"80f94647-9cb4-4aaf-8c6b-a842e486e98c","packageName":"component.container","className":"Form","type":"TS"} + + + + propertyName + + "formLoaded" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"9e772048-b43f-42f1-a370-2519dd4f6ad7","packageName":"component.field","className":"TextField","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "CREATE_USER" + + + + + + + operation + + "EQUALS" + + + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +argument + + + + staticValue + + + string + + + "Ответственный за ЗИ СВК" + + + + + + +behavior + + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + + + +method + + "hasRole" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + boolean + + + true + + + + + + + operation + + "NOT_EQUALS" + + + + + + + + + + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"f89e8996-7a75-437a-b2f7-68281199f46e","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setVisible" + + + + value + + + + staticValue + + + boolean + + +true + + + + + + + + @@ -762,7 +982,6 @@ a68c745b-dad9-4eb3-99fb-34c1554f21c3 Vbox_15% true - false false @@ -1514,7 +1733,6 @@ 84326c0c-7215-484e-812e-dad09f8e338e Vbox true - false false @@ -1738,12 +1956,6 @@ -required - - true - - - values @@ -1818,12 +2030,6 @@ label "Дата рождения" - - - -required - - true @@ -1848,7 +2054,6 @@ c49770cf-0841-433e-b355-a31ce0e22b42 Vbox true - false false @@ -2032,12 +2237,6 @@ label "Должность" - - - -required - - true @@ -2106,12 +2305,6 @@ -required - - true - - - unMaskValue false @@ -2183,12 +2376,6 @@ -required - - true - - - unMaskValue false @@ -2329,7 +2516,6 @@ 62adbc2d-0be1-45de-bc44-b77d11b129d7 Grid_groups true - false false @@ -3597,13 +3783,6 @@ - - 312c9663-86b4-4672-97bd-67d313585c00 - b838c4d9-b8f2-4142-96fe-240540a4802e - Номер - false - true - 3057d447-6d17-48a8-b096-b14ea88d17e8 @@ -3813,6 +3992,41 @@ + + + + + behavior + + {"objectId":"af94da3d-7ff2-4ffc-b520-5c5a7816f889","packageName":"component.button","className":"Button","type":"TS"} + + + + method + + "setCaption" + + + + value + + + + staticValue + + + string + + +"Отменить" + + + + + + + + @@ -4299,7 +4513,7 @@ string -"CANCEL_BY_AGREEER" +"REJECT_BY_AGREEER" @@ -4794,7 +5008,7 @@ string -"CANCEL_BY_PROCESSOR" +"REJECT_BY_PROCESSOR" @@ -6912,7 +7126,7 @@ string - "CANCEL" + "REJECT" @@ -6921,7 +7135,7 @@ operation - "EQUALS" + "CONTAINS" @@ -7128,6 +7342,74 @@ "EQUALS" + + + + + + + + + + + _isGroupSelected + +false + + + + one + + + + conditionFirstPart + + + + objectValue + + + +behavior + + {"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"} + + + +method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "CANCEL_BY_CREATOR" + + + + + + + operation + + "EQUALS" + + @@ -8866,6 +9148,74 @@ + + operation + + "DOES_NOT_CONTAIN" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + +{"objectId":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + +"getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + string + + + "REJECT" + + + + + operation diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 92632fb7..0f501469 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -866,7 +866,6 @@ b15ecae8-7ddd-470b-821d-48a9e512bac0 Vbox true - false false @@ -1072,12 +1071,6 @@ -required - - true - - - values @@ -1164,12 +1157,6 @@ minDateType null - - - -required - - true @@ -1194,7 +1181,6 @@ ea3759c2-1b7a-45f1-8422-d98df8e10d23 Vbox true - false false @@ -1306,12 +1292,6 @@ label "Должность" - - - -required - - true @@ -1367,12 +1347,6 @@ -required - - true - - - unMaskValue false @@ -1431,12 +1405,6 @@ -required - - true - - - unMaskValue false @@ -2492,13 +2460,6 @@ - - 133ca212-09a6-413a-ac66-e2f6ce188f1f - 594569b5-8dfd-4576-91cb-57c900c46c60 - Text field - false - true - 57c7cd21-1556-4dbd-b9da-33520486a1db 7b65eda9-a92d-49fe-8355-547f7941ba7f diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page index f8f362cd..10be2ebe 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page @@ -866,7 +866,6 @@ b15ecae8-7ddd-470b-821d-48a9e512bac0 Vbox true - false false @@ -1111,12 +1110,6 @@ -required - - true - - - values @@ -1197,12 +1190,6 @@ maxDateType "CURRENT" - - - -required - - true @@ -1227,7 +1214,6 @@ ea3759c2-1b7a-45f1-8422-d98df8e10d23 Vbox true - false false @@ -1339,12 +1325,6 @@ label "Должность" - - - -required - - true @@ -1400,12 +1380,6 @@ -required - - true - - - unMaskValue false @@ -1464,12 +1438,6 @@ -required - - true - - - unMaskValue false diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page index d0641935..a4a6490f 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page @@ -855,7 +855,6 @@ 6421e53c-2223-477f-bfb8-f6acaa4935b5 Hbox true - false false @@ -1111,12 +1110,6 @@ -required - - true - - - values @@ -1197,12 +1190,6 @@ maxDateType "CURRENT" - - - -required - - true @@ -1338,12 +1325,6 @@ label "Должность" - - - -required - - true @@ -1399,12 +1380,6 @@ -required - - true - - - unMaskValue false @@ -1463,12 +1438,6 @@ -required - - true - - - unMaskValue false diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page index a1844108..f9fbf1a3 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page @@ -1940,7 +1940,7 @@ label - "Отклонена" + "Отменена" @@ -1952,6 +1952,24 @@ + + + + + label + + "Отклонена" + + + + value + + "REJECT" + + + + + @@ -1994,7 +2012,7 @@ label - "Выполнена" + "Исполнена" @@ -2012,7 +2030,7 @@ label - "Выдан логин и пароль" + "Выдана карточка"