Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat

# Conflicts:
#	Dockerfile
This commit is contained in:
kochetkov 2024-09-02 09:57:41 +03:00
commit d0322684f0
53 changed files with 1604 additions and 1616 deletions

View file

@ -1,22 +0,0 @@
FROM maven:3-openjdk-17-slim AS build
RUN apt update \
&& apt upgrade -y \
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
&& apt install -y git nodejs \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY . .
RUN mvn clean && mvn package -T4C
FROM tomcat:9.0.93-jre17
ARG ADMIN_PASSWORD=Secr3t
COPY config/tomcat /usr/local/tomcat
RUN rm -rf /usr/local/tomcat/webapps/ROOT \
&& cat /usr/local/tomcat/conf/webbpm.properties >> /usr/local/tomcat/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomcat/conf/tomcat-users.xml
COPY --from=build /app/frontend/target/frontend*.war /usr/local/tomcat/webapps/ROOT.war
COPY --from=build /app/backend/target/dashboard*.war /usr/local/tomcat/webapps/dashboard.war

View file

@ -6,12 +6,14 @@ package ervu_dashboard.ervu_dashboard.db_beans.public_;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.TemporaryMeasures;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Testrecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.CitizenRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.DatabasechangeloglockRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.JobLogRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.PubRecruitmentRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.SubpoenaRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.TemporaryMeasuresRecord;
@ -37,6 +39,7 @@ public class Keys {
public static final UniqueKey<CitizenRecord> CITIZEN_PKEY = Internal.createUniqueKey(Citizen.CITIZEN, DSL.name("citizen_pkey"), new TableField[] { Citizen.CITIZEN.CITIZEN_ID }, true);
public static final UniqueKey<DatabasechangeloglockRecord> DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true);
public static final UniqueKey<JobLogRecord> JOB_LOG_PKEY = Internal.createUniqueKey(JobLog.JOB_LOG, DSL.name("job_log_pkey"), new TableField[] { JobLog.JOB_LOG.ID_JOB }, true);
public static final UniqueKey<PubRecruitmentRecord> RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true);
public static final UniqueKey<PubRecruitmentRecord> RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final UniqueKey<SubpoenaRecord> SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true);

View file

@ -5,9 +5,12 @@ package ervu_dashboard.ervu_dashboard.db_beans.public_;
import ervu_dashboard.ervu_dashboard.db_beans.DefaultCatalog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ChannelLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.TemporaryMeasures;
@ -34,6 +37,11 @@ public class Public extends SchemaImpl {
*/
public static final Public PUBLIC = new Public();
/**
* The table <code>public.channel_log</code>.
*/
public final ChannelLog CHANNEL_LOG = ChannelLog.CHANNEL_LOG;
/**
* The table <code>public.citizen</code>.
*/
@ -49,6 +57,16 @@ public class Public extends SchemaImpl {
*/
public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
/**
* The table <code>public.job_entry_log</code>.
*/
public final JobEntryLog JOB_ENTRY_LOG = JobEntryLog.JOB_ENTRY_LOG;
/**
* The table <code>public.job_log</code>.
*/
public final JobLog JOB_LOG = JobLog.JOB_LOG;
/**
* The table <code>public.pub_recruitment</code>.
*/
@ -85,9 +103,12 @@ public class Public extends SchemaImpl {
@Override
public final List<Table<?>> getTables() {
return Arrays.asList(
ChannelLog.CHANNEL_LOG,
Citizen.CITIZEN,
Databasechangelog.DATABASECHANGELOG,
Databasechangeloglock.DATABASECHANGELOGLOCK,
JobEntryLog.JOB_ENTRY_LOG,
JobLog.JOB_LOG,
PubRecruitment.PUB_RECRUITMENT,
Subpoena.SUBPOENA,
TemporaryMeasures.TEMPORARY_MEASURES,

View file

@ -4,9 +4,12 @@
package ervu_dashboard.ervu_dashboard.db_beans.public_;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ChannelLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.TemporaryMeasures;
@ -19,6 +22,11 @@ import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Testrecruitment;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {
/**
* The table <code>public.channel_log</code>.
*/
public static final ChannelLog CHANNEL_LOG = ChannelLog.CHANNEL_LOG;
/**
* The table <code>public.citizen</code>.
*/
@ -34,6 +42,16 @@ public class Tables {
*/
public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
/**
* The table <code>public.job_entry_log</code>.
*/
public static final JobEntryLog JOB_ENTRY_LOG = JobEntryLog.JOB_ENTRY_LOG;
/**
* The table <code>public.job_log</code>.
*/
public static final JobLog JOB_LOG = JobLog.JOB_LOG;
/**
* The table <code>public.pub_recruitment</code>.
*/

View file

@ -0,0 +1,211 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.Public;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.ChannelLogRecord;
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;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class ChannelLog extends TableImpl<ChannelLogRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.channel_log</code>
*/
public static final ChannelLog CHANNEL_LOG = new ChannelLog();
/**
* The class holding records for this type
*/
@Override
public Class<ChannelLogRecord> getRecordType() {
return ChannelLogRecord.class;
}
/**
* The column <code>public.channel_log.id_batch</code>.
*/
public final TableField<ChannelLogRecord, Long> ID_BATCH = createField(DSL.name("id_batch"), SQLDataType.BIGINT, this, "");
private ChannelLog(Name alias, Table<ChannelLogRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private ChannelLog(Name alias, Table<ChannelLogRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.channel_log</code> table reference
*/
public ChannelLog(String alias) {
this(DSL.name(alias), CHANNEL_LOG);
}
/**
* Create an aliased <code>public.channel_log</code> table reference
*/
public ChannelLog(Name alias) {
this(alias, CHANNEL_LOG);
}
/**
* Create a <code>public.channel_log</code> table reference
*/
public ChannelLog() {
this(DSL.name("channel_log"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public ChannelLog as(String alias) {
return new ChannelLog(DSL.name(alias), this);
}
@Override
public ChannelLog as(Name alias) {
return new ChannelLog(alias, this);
}
@Override
public ChannelLog as(Table<?> alias) {
return new ChannelLog(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public ChannelLog rename(String name) {
return new ChannelLog(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public ChannelLog rename(Name name) {
return new ChannelLog(name, null);
}
/**
* Rename this table
*/
@Override
public ChannelLog rename(Table<?> name) {
return new ChannelLog(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog where(Condition condition) {
return new ChannelLog(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public ChannelLog where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public ChannelLog where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public ChannelLog where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public ChannelLog where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public ChannelLog whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,211 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.Public;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.JobEntryLogRecord;
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;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class JobEntryLog extends TableImpl<JobEntryLogRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.job_entry_log</code>
*/
public static final JobEntryLog JOB_ENTRY_LOG = new JobEntryLog();
/**
* The class holding records for this type
*/
@Override
public Class<JobEntryLogRecord> getRecordType() {
return JobEntryLogRecord.class;
}
/**
* The column <code>public.job_entry_log.id_batch</code>.
*/
public final TableField<JobEntryLogRecord, Long> ID_BATCH = createField(DSL.name("id_batch"), SQLDataType.BIGINT, this, "");
private JobEntryLog(Name alias, Table<JobEntryLogRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private JobEntryLog(Name alias, Table<JobEntryLogRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.job_entry_log</code> table reference
*/
public JobEntryLog(String alias) {
this(DSL.name(alias), JOB_ENTRY_LOG);
}
/**
* Create an aliased <code>public.job_entry_log</code> table reference
*/
public JobEntryLog(Name alias) {
this(alias, JOB_ENTRY_LOG);
}
/**
* Create a <code>public.job_entry_log</code> table reference
*/
public JobEntryLog() {
this(DSL.name("job_entry_log"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public JobEntryLog as(String alias) {
return new JobEntryLog(DSL.name(alias), this);
}
@Override
public JobEntryLog as(Name alias) {
return new JobEntryLog(alias, this);
}
@Override
public JobEntryLog as(Table<?> alias) {
return new JobEntryLog(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public JobEntryLog rename(String name) {
return new JobEntryLog(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public JobEntryLog rename(Name name) {
return new JobEntryLog(name, null);
}
/**
* Rename this table
*/
@Override
public JobEntryLog rename(Table<?> name) {
return new JobEntryLog(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog where(Condition condition) {
return new JobEntryLog(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobEntryLog where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobEntryLog where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobEntryLog where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobEntryLog where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobEntryLog whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,265 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.public_.Public;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.JobLogRecord;
import java.sql.Date;
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;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class JobLog extends TableImpl<JobLogRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.job_log</code>
*/
public static final JobLog JOB_LOG = new JobLog();
/**
* The class holding records for this type
*/
@Override
public Class<JobLogRecord> getRecordType() {
return JobLogRecord.class;
}
/**
* The column <code>public.job_log.jobname</code>.
*/
public final TableField<JobLogRecord, String> JOBNAME = createField(DSL.name("jobname"), SQLDataType.CLOB, this, "");
/**
* The column <code>public.job_log.status</code>.
*/
public final TableField<JobLogRecord, String> STATUS = createField(DSL.name("status"), SQLDataType.CLOB, this, "");
/**
* The column <code>public.job_log.enddate</code>.
*/
public final TableField<JobLogRecord, Date> ENDDATE = createField(DSL.name("enddate"), SQLDataType.DATE, this, "");
/**
* The column <code>public.job_log.depdate</code>.
*/
public final TableField<JobLogRecord, Date> DEPDATE = createField(DSL.name("depdate"), SQLDataType.DATE, this, "");
/**
* The column <code>public.job_log.startdate</code>.
*/
public final TableField<JobLogRecord, Date> STARTDATE = createField(DSL.name("startdate"), SQLDataType.DATE, this, "");
/**
* The column <code>public.job_log.errors</code>.
*/
public final TableField<JobLogRecord, Integer> ERRORS = createField(DSL.name("errors"), SQLDataType.INTEGER, this, "");
/**
* The column <code>public.job_log.logdate</code>.
*/
public final TableField<JobLogRecord, Date> LOGDATE = createField(DSL.name("logdate"), SQLDataType.DATE, this, "");
/**
* The column <code>public.job_log.channel_id</code>.
*/
public final TableField<JobLogRecord, String> CHANNEL_ID = createField(DSL.name("channel_id"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>public.job_log.id_job</code>.
*/
public final TableField<JobLogRecord, Long> ID_JOB = createField(DSL.name("id_job"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
private JobLog(Name alias, Table<JobLogRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private JobLog(Name alias, Table<JobLogRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.job_log</code> table reference
*/
public JobLog(String alias) {
this(DSL.name(alias), JOB_LOG);
}
/**
* Create an aliased <code>public.job_log</code> table reference
*/
public JobLog(Name alias) {
this(alias, JOB_LOG);
}
/**
* Create a <code>public.job_log</code> table reference
*/
public JobLog() {
this(DSL.name("job_log"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public Identity<JobLogRecord, Long> getIdentity() {
return (Identity<JobLogRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<JobLogRecord> getPrimaryKey() {
return Keys.JOB_LOG_PKEY;
}
@Override
public JobLog as(String alias) {
return new JobLog(DSL.name(alias), this);
}
@Override
public JobLog as(Name alias) {
return new JobLog(alias, this);
}
@Override
public JobLog as(Table<?> alias) {
return new JobLog(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public JobLog rename(String name) {
return new JobLog(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public JobLog rename(Name name) {
return new JobLog(name, null);
}
/**
* Rename this table
*/
@Override
public JobLog rename(Table<?> name) {
return new JobLog(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog where(Condition condition) {
return new JobLog(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobLog where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobLog where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobLog where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public JobLog where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public JobLog whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -18,13 +18,9 @@ import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.AppearSubppoena.App
import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.ConsiderationComplaint.ConsiderationComplaintPath;
import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.Recruitment.RecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.Appeals.AppealsPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.Age.AgePath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.Busyness.BusynessPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.ChildMinor.ChildMinorPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.DriverLicense.DriverLicensePath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.EducationLevel.EducationLevelPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.MaritalStatus.MaritalStatusPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.Subpoenas.SubpoenasPath;
import java.util.Arrays;
import java.util.Collection;
@ -76,7 +72,7 @@ public class PubRecruitment extends TableImpl<PubRecruitmentRecord> {
/**
* The column <code>public.pub_recruitment.id</code>.
*/
public final TableField<PubRecruitmentRecord, String> ID = createField(DSL.name("id"), SQLDataType.CHAR(36).nullable(false).defaultValue(DSL.field(DSL.raw("uuid_generate_v4()"), SQLDataType.CHAR)), this, "");
public final TableField<PubRecruitmentRecord, String> ID = createField(DSL.name("id"), SQLDataType.CHAR(36).nullable(false).defaultValue(DSL.field(DSL.raw("public.uuid_generate_v4()"), SQLDataType.CHAR)), this, "");
/**
* The column <code>public.pub_recruitment.idm_id</code>.
@ -331,19 +327,6 @@ public class PubRecruitment extends TableImpl<PubRecruitmentRecord> {
return _appeals;
}
private transient AgePath _age;
/**
* Get the implicit to-many join path to the
* <code>total_registered.age</code> table
*/
public AgePath age() {
if (_age == null)
_age = new AgePath(this, null, ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys.AGE__AGE_FK1.getInverseKey());
return _age;
}
private transient BusynessPath _busyness;
/**
@ -357,32 +340,6 @@ public class PubRecruitment extends TableImpl<PubRecruitmentRecord> {
return _busyness;
}
private transient ChildMinorPath _childMinor;
/**
* Get the implicit to-many join path to the
* <code>total_registered.child_minor</code> table
*/
public ChildMinorPath childMinor() {
if (_childMinor == null)
_childMinor = new ChildMinorPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys.CHILD_MINOR__CHILD_MINOR_FK1.getInverseKey());
return _childMinor;
}
private transient DriverLicensePath _driverLicense;
/**
* Get the implicit to-many join path to the
* <code>total_registered.driver_license</code> table
*/
public DriverLicensePath driverLicense() {
if (_driverLicense == null)
_driverLicense = new DriverLicensePath(this, null, ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys.DRIVER_LICENSE__DRIVER_LICENSE_FK1.getInverseKey());
return _driverLicense;
}
private transient EducationLevelPath _educationLevel;
/**
@ -409,19 +366,6 @@ public class PubRecruitment extends TableImpl<PubRecruitmentRecord> {
return _maritalStatus;
}
private transient SubpoenasPath _subpoenas;
/**
* Get the implicit to-many join path to the
* <code>total_registered.subpoenas</code> table
*/
public SubpoenasPath subpoenas() {
if (_subpoenas == null)
_subpoenas = new SubpoenasPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys.SUBPOENAS__TR_SUBPOENAS_FK1.getInverseKey());
return _subpoenas;
}
@Override
public PubRecruitment as(String alias) {
return new PubRecruitment(DSL.name(alias), this);

View file

@ -0,0 +1,54 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ChannelLog;
import org.jooq.impl.TableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class ChannelLogRecord extends TableRecordImpl<ChannelLogRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.channel_log.id_batch</code>.
*/
public void setIdBatch(Long value) {
set(0, value);
}
/**
* Getter for <code>public.channel_log.id_batch</code>.
*/
public Long getIdBatch() {
return (Long) get(0);
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached ChannelLogRecord
*/
public ChannelLogRecord() {
super(ChannelLog.CHANNEL_LOG);
}
/**
* Create a detached, initialised ChannelLogRecord
*/
public ChannelLogRecord(Long idBatch) {
super(ChannelLog.CHANNEL_LOG);
setIdBatch(idBatch);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,54 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog;
import org.jooq.impl.TableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class JobEntryLogRecord extends TableRecordImpl<JobEntryLogRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.job_entry_log.id_batch</code>.
*/
public void setIdBatch(Long value) {
set(0, value);
}
/**
* Getter for <code>public.job_entry_log.id_batch</code>.
*/
public Long getIdBatch() {
return (Long) get(0);
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached JobEntryLogRecord
*/
public JobEntryLogRecord() {
super(JobEntryLog.JOB_ENTRY_LOG);
}
/**
* Create a detached, initialised JobEntryLogRecord
*/
public JobEntryLogRecord(Long idBatch) {
super(JobEntryLog.JOB_ENTRY_LOG);
setIdBatch(idBatch);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,186 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class JobLogRecord extends UpdatableRecordImpl<JobLogRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.job_log.jobname</code>.
*/
public void setJobname(String value) {
set(0, value);
}
/**
* Getter for <code>public.job_log.jobname</code>.
*/
public String getJobname() {
return (String) get(0);
}
/**
* Setter for <code>public.job_log.status</code>.
*/
public void setStatus(String value) {
set(1, value);
}
/**
* Getter for <code>public.job_log.status</code>.
*/
public String getStatus() {
return (String) get(1);
}
/**
* Setter for <code>public.job_log.enddate</code>.
*/
public void setEnddate(Date value) {
set(2, value);
}
/**
* Getter for <code>public.job_log.enddate</code>.
*/
public Date getEnddate() {
return (Date) get(2);
}
/**
* Setter for <code>public.job_log.depdate</code>.
*/
public void setDepdate(Date value) {
set(3, value);
}
/**
* Getter for <code>public.job_log.depdate</code>.
*/
public Date getDepdate() {
return (Date) get(3);
}
/**
* Setter for <code>public.job_log.startdate</code>.
*/
public void setStartdate(Date value) {
set(4, value);
}
/**
* Getter for <code>public.job_log.startdate</code>.
*/
public Date getStartdate() {
return (Date) get(4);
}
/**
* Setter for <code>public.job_log.errors</code>.
*/
public void setErrors(Integer value) {
set(5, value);
}
/**
* Getter for <code>public.job_log.errors</code>.
*/
public Integer getErrors() {
return (Integer) get(5);
}
/**
* Setter for <code>public.job_log.logdate</code>.
*/
public void setLogdate(Date value) {
set(6, value);
}
/**
* Getter for <code>public.job_log.logdate</code>.
*/
public Date getLogdate() {
return (Date) get(6);
}
/**
* Setter for <code>public.job_log.channel_id</code>.
*/
public void setChannelId(String value) {
set(7, value);
}
/**
* Getter for <code>public.job_log.channel_id</code>.
*/
public String getChannelId() {
return (String) get(7);
}
/**
* Setter for <code>public.job_log.id_job</code>.
*/
public void setIdJob(Long value) {
set(8, value);
}
/**
* Getter for <code>public.job_log.id_job</code>.
*/
public Long getIdJob() {
return (Long) get(8);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached JobLogRecord
*/
public JobLogRecord() {
super(JobLog.JOB_LOG);
}
/**
* Create a detached, initialised JobLogRecord
*/
public JobLogRecord(String jobname, String status, Date enddate, Date depdate, Date startdate, Integer errors, Date logdate, String channelId, Long idJob) {
super(JobLog.JOB_LOG);
setJobname(jobname);
setStatus(status);
setEnddate(enddate);
setDepdate(depdate);
setStartdate(startdate);
setErrors(errors);
setLogdate(logdate);
setChannelId(channelId);
setIdJob(idJob);
resetChangedOnNotNull();
}
}

View file

@ -43,25 +43,21 @@ public class Keys {
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<AgeRecord> PK_AGE = Internal.createUniqueKey(Age.AGE, DSL.name("pk_age"), new TableField[] { Age.AGE.ID_AGE }, true);
public static final UniqueKey<AgeRecord> AGE_PKEY = Internal.createUniqueKey(Age.AGE, DSL.name("age_pkey"), new TableField[] { Age.AGE.REGISTERED, Age.AGE.RECRUITMENT_ID, Age.AGE.RECORDING_DATE, Age.AGE.ALL_M_W }, true);
public static final UniqueKey<BusynessRecord> PK_BUSYNESS = Internal.createUniqueKey(Busyness.BUSYNESS, DSL.name("pk_busyness"), new TableField[] { Busyness.BUSYNESS.ID_BUSYNESS }, true);
public static final UniqueKey<ChildMinorRecord> PK_CHILD_MINOR = Internal.createUniqueKey(ChildMinor.CHILD_MINOR, DSL.name("pk_child_minor"), new TableField[] { ChildMinor.CHILD_MINOR.ID_CHILD_MINOR }, true);
public static final UniqueKey<DriverLicenseRecord> PK_DRIVER_LICENSE = Internal.createUniqueKey(DriverLicense.DRIVER_LICENSE, DSL.name("pk_driver_license"), new TableField[] { DriverLicense.DRIVER_LICENSE.ID_DRIVER_LICENSE }, true);
public static final UniqueKey<ChildMinorRecord> CHILD_MINOR_PKEY = Internal.createUniqueKey(ChildMinor.CHILD_MINOR, DSL.name("child_minor_pkey"), new TableField[] { ChildMinor.CHILD_MINOR.ALL_M_W, ChildMinor.CHILD_MINOR.RECORDING_DATE, ChildMinor.CHILD_MINOR.RECRUITMENT_ID }, true);
public static final UniqueKey<DriverLicenseRecord> DRIVER_LICENSE_PKEY = Internal.createUniqueKey(DriverLicense.DRIVER_LICENSE, DSL.name("driver_license_pkey"), new TableField[] { DriverLicense.DRIVER_LICENSE.RECRUITMENT_ID, DriverLicense.DRIVER_LICENSE.ALL_M_W, DriverLicense.DRIVER_LICENSE.RECORDING_DATE }, true);
public static final UniqueKey<EducationLevelRecord> PK_EDUCATION_LEVEL = Internal.createUniqueKey(EducationLevel.EDUCATION_LEVEL, DSL.name("pk_education_level"), new TableField[] { EducationLevel.EDUCATION_LEVEL.ID_EDUCATION_LEVEL }, true);
public static final UniqueKey<MaritalStatusRecord> PK_MARITAL_STATUS = Internal.createUniqueKey(MaritalStatus.MARITAL_STATUS, DSL.name("pk_marital_status"), new TableField[] { MaritalStatus.MARITAL_STATUS.ID_MARITAL_STATUS }, true);
public static final UniqueKey<RegMilCatRecord> REG_MIL_CAT_PKEY = Internal.createUniqueKey(RegMilCat.REG_MIL_CAT, DSL.name("reg_mil_cat_pkey"), new TableField[] { RegMilCat.REG_MIL_CAT.MIL_REG, RegMilCat.REG_MIL_CAT.RECRUITMENT_ID, RegMilCat.REG_MIL_CAT.RECORDING_DATE }, true);
public static final UniqueKey<RemovedRegistryRecord> REMOVED_REGISTRY_PKEY = Internal.createUniqueKey(RemovedRegistry.REMOVED_REGISTRY, DSL.name("removed_registry_pkey"), new TableField[] { RemovedRegistry.REMOVED_REGISTRY.RECRUITMENT_ID, RemovedRegistry.REMOVED_REGISTRY.RECORDING_DATE }, true);
public static final UniqueKey<SubpoenasRecord> PK_SUBPOENA = Internal.createUniqueKey(Subpoenas.SUBPOENAS, DSL.name("pk_subpoena"), new TableField[] { Subpoenas.SUBPOENAS.ID_SUBPOENA }, true);
public static final UniqueKey<SubpoenasRecord> SUBPOENAS_PKEY = Internal.createUniqueKey(Subpoenas.SUBPOENAS, DSL.name("subpoenas_pkey"), new TableField[] { Subpoenas.SUBPOENAS.MIL_REG, Subpoenas.SUBPOENAS.RECRUITMENT_ID, Subpoenas.SUBPOENAS.RECORDING_DATE }, true);
// -------------------------------------------------------------------------
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
public static final ForeignKey<AgeRecord, PubRecruitmentRecord> AGE__AGE_FK1 = Internal.createForeignKey(Age.AGE, DSL.name("age_fk1"), new TableField[] { Age.AGE.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<BusynessRecord, PubRecruitmentRecord> BUSYNESS__BUSYNESS_FK1 = Internal.createForeignKey(Busyness.BUSYNESS, DSL.name("busyness_fk1"), new TableField[] { Busyness.BUSYNESS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<ChildMinorRecord, PubRecruitmentRecord> CHILD_MINOR__CHILD_MINOR_FK1 = Internal.createForeignKey(ChildMinor.CHILD_MINOR, DSL.name("child_minor_fk1"), new TableField[] { ChildMinor.CHILD_MINOR.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<DriverLicenseRecord, PubRecruitmentRecord> DRIVER_LICENSE__DRIVER_LICENSE_FK1 = Internal.createForeignKey(DriverLicense.DRIVER_LICENSE, DSL.name("driver_license_fk1"), new TableField[] { DriverLicense.DRIVER_LICENSE.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<EducationLevelRecord, PubRecruitmentRecord> EDUCATION_LEVEL__EDUCATION_LEVEL_FK1 = Internal.createForeignKey(EducationLevel.EDUCATION_LEVEL, DSL.name("education_level_fk1"), new TableField[] { EducationLevel.EDUCATION_LEVEL.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<MaritalStatusRecord, PubRecruitmentRecord> MARITAL_STATUS__MARITAL_STATUS_FK1 = Internal.createForeignKey(MaritalStatus.MARITAL_STATUS, DSL.name("marital_status_fk1"), new TableField[] { MaritalStatus.MARITAL_STATUS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final ForeignKey<SubpoenasRecord, PubRecruitmentRecord> SUBPOENAS__TR_SUBPOENAS_FK1 = Internal.createForeignKey(Subpoenas.SUBPOENAS, DSL.name("tr_subpoenas_fk1"), new TableField[] { Subpoenas.SUBPOENAS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.public_.Keys.RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
}

View file

@ -4,27 +4,20 @@
package ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment.PubRecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.TotalRegistered;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.records.AgeRecord;
import java.math.BigDecimal;
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;
@ -59,11 +52,6 @@ public class Age extends TableImpl<AgeRecord> {
return AgeRecord.class;
}
/**
* The column <code>total_registered.age.id_age</code>.
*/
public final TableField<AgeRecord, Long> ID_AGE = createField(DSL.name("id_age"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>total_registered.age.17_yaers</code>. Возраст 17
*/
@ -102,18 +90,12 @@ public class Age extends TableImpl<AgeRecord> {
/**
* The column <code>total_registered.age.all_M_W</code>. Все/мужчины/женщины
*/
public final TableField<AgeRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CLOB, this, "Все/мужчины/женщины");
/**
* The column <code>total_registered.age.registered</code>. Состоит на учете
* или нет
*/
public final TableField<AgeRecord, Boolean> REGISTERED = createField(DSL.name("registered"), SQLDataType.BOOLEAN, this, "Состоит на учете или нет");
public final TableField<AgeRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CHAR(10).nullable(false), this, "Все/мужчины/женщины");
/**
* The column <code>total_registered.age.recording_date</code>. Дата записи
*/
public final TableField<AgeRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE, this, "Дата записи");
public final TableField<AgeRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи");
/**
* The column <code>total_registered.age.46-50_years</code>. Возраст 46-50
@ -171,7 +153,17 @@ public class Age extends TableImpl<AgeRecord> {
/**
* The column <code>total_registered.age.recruitment_id</code>.
*/
public final TableField<AgeRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, "");
public final TableField<AgeRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column <code>total_registered.age.registered</code>.
*/
public final TableField<AgeRecord, String> REGISTERED = createField(DSL.name("registered"), SQLDataType.CHAR(10).nullable(false), this, "");
/**
* The column <code>total_registered.age.id_age</code>.
*/
public final TableField<AgeRecord, Long> ID_AGE = createField(DSL.name("id_age"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
private Age(Name alias, Table<AgeRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -202,37 +194,6 @@ public class Age extends TableImpl<AgeRecord> {
this(DSL.name("age"), null);
}
public <O extends Record> Age(Table<O> path, ForeignKey<O, AgeRecord> childPath, InverseForeignKey<O, AgeRecord> parentPath) {
super(path, childPath, parentPath, AGE);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class AgePath extends Age implements Path<AgeRecord> {
public <O extends Record> AgePath(Table<O> path, ForeignKey<O, AgeRecord> childPath, InverseForeignKey<O, AgeRecord> parentPath) {
super(path, childPath, parentPath);
}
private AgePath(Name alias, Table<AgeRecord> aliased) {
super(alias, aliased);
}
@Override
public AgePath as(String alias) {
return new AgePath(DSL.name(alias), this);
}
@Override
public AgePath as(Name alias) {
return new AgePath(alias, this);
}
@Override
public AgePath as(Table<?> alias) {
return new AgePath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : TotalRegistered.TOTAL_REGISTERED;
@ -245,25 +206,7 @@ public class Age extends TableImpl<AgeRecord> {
@Override
public UniqueKey<AgeRecord> getPrimaryKey() {
return Keys.PK_AGE;
}
@Override
public List<ForeignKey<AgeRecord, ?>> getReferences() {
return Arrays.asList(Keys.AGE__AGE_FK1);
}
private transient PubRecruitmentPath _pubRecruitment;
/**
* Get the implicit join path to the <code>public.pub_recruitment</code>
* table.
*/
public PubRecruitmentPath pubRecruitment() {
if (_pubRecruitment == null)
_pubRecruitment = new PubRecruitmentPath(this, Keys.AGE__AGE_FK1, null);
return _pubRecruitment;
return Keys.AGE_PKEY;
}
@Override

View file

@ -4,27 +4,20 @@
package ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment.PubRecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.TotalRegistered;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.records.ChildMinorRecord;
import java.math.BigDecimal;
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;
@ -59,11 +52,6 @@ public class ChildMinor extends TableImpl<ChildMinorRecord> {
return ChildMinorRecord.class;
}
/**
* The column <code>total_registered.child_minor.id_child_minor</code>.
*/
public final TableField<ChildMinorRecord, Long> ID_CHILD_MINOR = createField(DSL.name("id_child_minor"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>total_registered.child_minor.no_child</code>. Нет детей
*/
@ -94,13 +82,13 @@ public class ChildMinor extends TableImpl<ChildMinorRecord> {
* The column <code>total_registered.child_minor.all_M_W</code>.
* Все/Мужчины/Женщины
*/
public final TableField<ChildMinorRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CLOB, this, "Все/Мужчины/Женщины");
public final TableField<ChildMinorRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CHAR(10).nullable(false), this, "Все/Мужчины/Женщины");
/**
* The column <code>total_registered.child_minor.recording_date</code>. Дата
* записи
*/
public final TableField<ChildMinorRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE, this, "Дата записи");
public final TableField<ChildMinorRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false), this, "Дата записи");
/**
* The column <code>total_registered.child_minor.no_child_percent</code>.
@ -136,7 +124,12 @@ public class ChildMinor extends TableImpl<ChildMinorRecord> {
/**
* The column <code>total_registered.child_minor.recruitment_id</code>.
*/
public final TableField<ChildMinorRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, "");
public final TableField<ChildMinorRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column <code>total_registered.child_minor.id_child_minor</code>.
*/
public final TableField<ChildMinorRecord, Long> ID_CHILD_MINOR = createField(DSL.name("id_child_minor"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
private ChildMinor(Name alias, Table<ChildMinorRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -169,37 +162,6 @@ public class ChildMinor extends TableImpl<ChildMinorRecord> {
this(DSL.name("child_minor"), null);
}
public <O extends Record> ChildMinor(Table<O> path, ForeignKey<O, ChildMinorRecord> childPath, InverseForeignKey<O, ChildMinorRecord> parentPath) {
super(path, childPath, parentPath, CHILD_MINOR);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class ChildMinorPath extends ChildMinor implements Path<ChildMinorRecord> {
public <O extends Record> ChildMinorPath(Table<O> path, ForeignKey<O, ChildMinorRecord> childPath, InverseForeignKey<O, ChildMinorRecord> parentPath) {
super(path, childPath, parentPath);
}
private ChildMinorPath(Name alias, Table<ChildMinorRecord> aliased) {
super(alias, aliased);
}
@Override
public ChildMinorPath as(String alias) {
return new ChildMinorPath(DSL.name(alias), this);
}
@Override
public ChildMinorPath as(Name alias) {
return new ChildMinorPath(alias, this);
}
@Override
public ChildMinorPath as(Table<?> alias) {
return new ChildMinorPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : TotalRegistered.TOTAL_REGISTERED;
@ -212,25 +174,7 @@ public class ChildMinor extends TableImpl<ChildMinorRecord> {
@Override
public UniqueKey<ChildMinorRecord> getPrimaryKey() {
return Keys.PK_CHILD_MINOR;
}
@Override
public List<ForeignKey<ChildMinorRecord, ?>> getReferences() {
return Arrays.asList(Keys.CHILD_MINOR__CHILD_MINOR_FK1);
}
private transient PubRecruitmentPath _pubRecruitment;
/**
* Get the implicit join path to the <code>public.pub_recruitment</code>
* table.
*/
public PubRecruitmentPath pubRecruitment() {
if (_pubRecruitment == null)
_pubRecruitment = new PubRecruitmentPath(this, Keys.CHILD_MINOR__CHILD_MINOR_FK1, null);
return _pubRecruitment;
return Keys.CHILD_MINOR_PKEY;
}
@Override

View file

@ -4,27 +4,20 @@
package ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment.PubRecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.TotalRegistered;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.records.DriverLicenseRecord;
import java.math.BigDecimal;
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;
@ -60,12 +53,6 @@ public class DriverLicense extends TableImpl<DriverLicenseRecord> {
return DriverLicenseRecord.class;
}
/**
* The column
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public final TableField<DriverLicenseRecord, Long> ID_DRIVER_LICENSE = createField(DSL.name("id_driver_license"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>total_registered.driver_license.nope</code>. нет
* водительского удостоверения
@ -101,13 +88,13 @@ public class DriverLicense extends TableImpl<DriverLicenseRecord> {
* The column <code>total_registered.driver_license.all_M_W</code>.
* Все/Мужчины/Женщины
*/
public final TableField<DriverLicenseRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CLOB, this, "Все/Мужчины/Женщины");
public final TableField<DriverLicenseRecord, String> ALL_M_W = createField(DSL.name("all_M_W"), SQLDataType.CHAR(10).nullable(false), this, "Все/Мужчины/Женщины");
/**
* The column <code>total_registered.driver_license.recording_date</code>.
* Дата записи
*/
public final TableField<DriverLicenseRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE, this, "Дата записи");
public final TableField<DriverLicenseRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false), this, "Дата записи");
/**
* The column <code>total_registered.driver_license.nope_repcent</code>. нет
@ -148,7 +135,13 @@ public class DriverLicense extends TableImpl<DriverLicenseRecord> {
/**
* The column <code>total_registered.driver_license.recruitment_id</code>.
*/
public final TableField<DriverLicenseRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, "");
public final TableField<DriverLicenseRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public final TableField<DriverLicenseRecord, Long> ID_DRIVER_LICENSE = createField(DSL.name("id_driver_license"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
private DriverLicense(Name alias, Table<DriverLicenseRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -181,37 +174,6 @@ public class DriverLicense extends TableImpl<DriverLicenseRecord> {
this(DSL.name("driver_license"), null);
}
public <O extends Record> DriverLicense(Table<O> path, ForeignKey<O, DriverLicenseRecord> childPath, InverseForeignKey<O, DriverLicenseRecord> parentPath) {
super(path, childPath, parentPath, DRIVER_LICENSE);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class DriverLicensePath extends DriverLicense implements Path<DriverLicenseRecord> {
public <O extends Record> DriverLicensePath(Table<O> path, ForeignKey<O, DriverLicenseRecord> childPath, InverseForeignKey<O, DriverLicenseRecord> parentPath) {
super(path, childPath, parentPath);
}
private DriverLicensePath(Name alias, Table<DriverLicenseRecord> aliased) {
super(alias, aliased);
}
@Override
public DriverLicensePath as(String alias) {
return new DriverLicensePath(DSL.name(alias), this);
}
@Override
public DriverLicensePath as(Name alias) {
return new DriverLicensePath(alias, this);
}
@Override
public DriverLicensePath as(Table<?> alias) {
return new DriverLicensePath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : TotalRegistered.TOTAL_REGISTERED;
@ -224,25 +186,7 @@ public class DriverLicense extends TableImpl<DriverLicenseRecord> {
@Override
public UniqueKey<DriverLicenseRecord> getPrimaryKey() {
return Keys.PK_DRIVER_LICENSE;
}
@Override
public List<ForeignKey<DriverLicenseRecord, ?>> getReferences() {
return Arrays.asList(Keys.DRIVER_LICENSE__DRIVER_LICENSE_FK1);
}
private transient PubRecruitmentPath _pubRecruitment;
/**
* Get the implicit join path to the <code>public.pub_recruitment</code>
* table.
*/
public PubRecruitmentPath pubRecruitment() {
if (_pubRecruitment == null)
_pubRecruitment = new PubRecruitmentPath(this, Keys.DRIVER_LICENSE__DRIVER_LICENSE_FK1, null);
return _pubRecruitment;
return Keys.DRIVER_LICENSE_PKEY;
}
@Override

View file

@ -4,27 +4,20 @@
package ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables;
import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.PubRecruitment.PubRecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.TotalRegistered;
import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.records.SubpoenasRecord;
import java.math.BigDecimal;
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;
@ -59,11 +52,6 @@ public class Subpoenas extends TableImpl<SubpoenasRecord> {
return SubpoenasRecord.class;
}
/**
* The column <code>total_registered.subpoenas.id_subpoena</code>.
*/
public final TableField<SubpoenasRecord, Long> ID_SUBPOENA = createField(DSL.name("id_subpoena"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>total_registered.subpoenas.subpoena</code>. Направлено
* повесток
@ -125,7 +113,7 @@ public class Subpoenas extends TableImpl<SubpoenasRecord> {
* The column <code>total_registered.subpoenas.recording_date</code>. Дата
* записи
*/
public final TableField<SubpoenasRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи");
public final TableField<SubpoenasRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи");
/**
* The column <code>total_registered.subpoenas.appeared_percent</code>.
@ -182,12 +170,17 @@ public class Subpoenas extends TableImpl<SubpoenasRecord> {
/**
* The column <code>total_registered.subpoenas.recruitment_id</code>.
*/
public final TableField<SubpoenasRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, "");
public final TableField<SubpoenasRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column <code>total_registered.subpoenas.mil_reg</code>.
*/
public final TableField<SubpoenasRecord, BigDecimal> MIL_REG = createField(DSL.name("mil_reg"), SQLDataType.NUMERIC, this, "");
public final TableField<SubpoenasRecord, BigDecimal> MIL_REG = createField(DSL.name("mil_reg"), SQLDataType.NUMERIC.nullable(false), this, "");
/**
* The column <code>total_registered.subpoenas.id_subpoena</code>.
*/
public final TableField<SubpoenasRecord, Long> ID_SUBPOENA = createField(DSL.name("id_subpoena"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
private Subpoenas(Name alias, Table<SubpoenasRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -218,37 +211,6 @@ public class Subpoenas extends TableImpl<SubpoenasRecord> {
this(DSL.name("subpoenas"), null);
}
public <O extends Record> Subpoenas(Table<O> path, ForeignKey<O, SubpoenasRecord> childPath, InverseForeignKey<O, SubpoenasRecord> parentPath) {
super(path, childPath, parentPath, SUBPOENAS);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class SubpoenasPath extends Subpoenas implements Path<SubpoenasRecord> {
public <O extends Record> SubpoenasPath(Table<O> path, ForeignKey<O, SubpoenasRecord> childPath, InverseForeignKey<O, SubpoenasRecord> parentPath) {
super(path, childPath, parentPath);
}
private SubpoenasPath(Name alias, Table<SubpoenasRecord> aliased) {
super(alias, aliased);
}
@Override
public SubpoenasPath as(String alias) {
return new SubpoenasPath(DSL.name(alias), this);
}
@Override
public SubpoenasPath as(Name alias) {
return new SubpoenasPath(alias, this);
}
@Override
public SubpoenasPath as(Table<?> alias) {
return new SubpoenasPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : TotalRegistered.TOTAL_REGISTERED;
@ -261,25 +223,7 @@ public class Subpoenas extends TableImpl<SubpoenasRecord> {
@Override
public UniqueKey<SubpoenasRecord> getPrimaryKey() {
return Keys.PK_SUBPOENA;
}
@Override
public List<ForeignKey<SubpoenasRecord, ?>> getReferences() {
return Arrays.asList(Keys.SUBPOENAS__TR_SUBPOENAS_FK1);
}
private transient PubRecruitmentPath _pubRecruitment;
/**
* Get the implicit join path to the <code>public.pub_recruitment</code>
* table.
*/
public PubRecruitmentPath pubRecruitment() {
if (_pubRecruitment == null)
_pubRecruitment = new PubRecruitmentPath(this, Keys.SUBPOENAS__TR_SUBPOENAS_FK1, null);
return _pubRecruitment;
return Keys.SUBPOENAS_PKEY;
}
@Override

View file

@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.Age;
import java.math.BigDecimal;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.Record4;
import org.jooq.impl.UpdatableRecordImpl;
@ -21,174 +21,144 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>total_registered.age.id_age</code>.
*/
public void setIdAge(Long value) {
set(0, value);
}
/**
* Getter for <code>total_registered.age.id_age</code>.
*/
public Long getIdAge() {
return (Long) get(0);
}
/**
* Setter for <code>total_registered.age.17_yaers</code>. Возраст 17
*/
public void set_17Yaers(BigDecimal value) {
set(1, value);
set(0, value);
}
/**
* Getter for <code>total_registered.age.17_yaers</code>. Возраст 17
*/
public BigDecimal get_17Yaers() {
return (BigDecimal) get(1);
return (BigDecimal) get(0);
}
/**
* Setter for <code>total_registered.age.18-26_years</code>. Возраст 18-26
*/
public void set_18_26Years(BigDecimal value) {
set(2, value);
set(1, value);
}
/**
* Getter for <code>total_registered.age.18-26_years</code>. Возраст 18-26
*/
public BigDecimal get_18_26Years() {
return (BigDecimal) get(2);
return (BigDecimal) get(1);
}
/**
* Setter for <code>total_registered.age.27-30_years</code>. Возраст 27-30
*/
public void set_27_30Years(BigDecimal value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>total_registered.age.27-30_years</code>. Возраст 27-30
*/
public BigDecimal get_27_30Years() {
return (BigDecimal) get(3);
return (BigDecimal) get(2);
}
/**
* Setter for <code>total_registered.age.31-35_years</code>. Возраст 31-35
*/
public void set_31_35Years(BigDecimal value) {
set(4, value);
set(3, value);
}
/**
* Getter for <code>total_registered.age.31-35_years</code>. Возраст 31-35
*/
public BigDecimal get_31_35Years() {
return (BigDecimal) get(4);
return (BigDecimal) get(3);
}
/**
* Setter for <code>total_registered.age.36-40_years</code>. Возраст 36-40
*/
public void set_36_40Years(BigDecimal value) {
set(5, value);
set(4, value);
}
/**
* Getter for <code>total_registered.age.36-40_years</code>. Возраст 36-40
*/
public BigDecimal get_36_40Years() {
return (BigDecimal) get(5);
return (BigDecimal) get(4);
}
/**
* Setter for <code>total_registered.age.41-45_years</code>. Возраст 41-45
*/
public void set_41_45Years(BigDecimal value) {
set(6, value);
set(5, value);
}
/**
* Getter for <code>total_registered.age.41-45_years</code>. Возраст 41-45
*/
public BigDecimal get_41_45Years() {
return (BigDecimal) get(6);
return (BigDecimal) get(5);
}
/**
* Setter for <code>total_registered.age.51+_years</code>. Возраст 51+
*/
public void set_51_2bYears(BigDecimal value) {
set(7, value);
set(6, value);
}
/**
* Getter for <code>total_registered.age.51+_years</code>. Возраст 51+
*/
public BigDecimal get_51_2bYears() {
return (BigDecimal) get(7);
return (BigDecimal) get(6);
}
/**
* Setter for <code>total_registered.age.all_M_W</code>. Все/мужчины/женщины
*/
public void setAllMW(String value) {
set(8, value);
set(7, value);
}
/**
* Getter for <code>total_registered.age.all_M_W</code>. Все/мужчины/женщины
*/
public String getAllMW() {
return (String) get(8);
}
/**
* Setter for <code>total_registered.age.registered</code>. Состоит на учете
* или нет
*/
public void setRegistered(Boolean value) {
set(9, value);
}
/**
* Getter for <code>total_registered.age.registered</code>. Состоит на учете
* или нет
*/
public Boolean getRegistered() {
return (Boolean) get(9);
return (String) get(7);
}
/**
* Setter for <code>total_registered.age.recording_date</code>. Дата записи
*/
public void setRecordingDate(Date value) {
set(10, value);
set(8, value);
}
/**
* Getter for <code>total_registered.age.recording_date</code>. Дата записи
*/
public Date getRecordingDate() {
return (Date) get(10);
return (Date) get(8);
}
/**
* Setter for <code>total_registered.age.46-50_years</code>. Возраст 46-50
*/
public void set_46_50Years(BigDecimal value) {
set(11, value);
set(9, value);
}
/**
* Getter for <code>total_registered.age.46-50_years</code>. Возраст 46-50
*/
public BigDecimal get_46_50Years() {
return (BigDecimal) get(11);
return (BigDecimal) get(9);
}
/**
@ -196,7 +166,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* в процентах
*/
public void set_17YaersPercent(BigDecimal value) {
set(12, value);
set(10, value);
}
/**
@ -204,7 +174,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* в процентах
*/
public BigDecimal get_17YaersPercent() {
return (BigDecimal) get(12);
return (BigDecimal) get(10);
}
/**
@ -212,7 +182,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 18-26 в процентах
*/
public void set_18_26YearsPercent(BigDecimal value) {
set(13, value);
set(11, value);
}
/**
@ -220,7 +190,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 18-26 в процентах
*/
public BigDecimal get_18_26YearsPercent() {
return (BigDecimal) get(13);
return (BigDecimal) get(11);
}
/**
@ -228,7 +198,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 27-30 в процентах
*/
public void set_27_30YearsPercent(BigDecimal value) {
set(14, value);
set(12, value);
}
/**
@ -236,7 +206,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 27-30 в процентах
*/
public BigDecimal get_27_30YearsPercent() {
return (BigDecimal) get(14);
return (BigDecimal) get(12);
}
/**
@ -244,7 +214,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 31-35 в процентах
*/
public void set_31_35YearsPercent(BigDecimal value) {
set(15, value);
set(13, value);
}
/**
@ -252,7 +222,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 31-35 в процентах
*/
public BigDecimal get_31_35YearsPercent() {
return (BigDecimal) get(15);
return (BigDecimal) get(13);
}
/**
@ -260,7 +230,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 36-40 в процентах
*/
public void set_36_40YearsPercent(BigDecimal value) {
set(16, value);
set(14, value);
}
/**
@ -268,7 +238,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 36-40 в процентах
*/
public BigDecimal get_36_40YearsPercent() {
return (BigDecimal) get(16);
return (BigDecimal) get(14);
}
/**
@ -276,7 +246,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 41-45 в процентах
*/
public void set_41_45YearsPercent(BigDecimal value) {
set(17, value);
set(15, value);
}
/**
@ -284,7 +254,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 41-45 в процентах
*/
public BigDecimal get_41_45YearsPercent() {
return (BigDecimal) get(17);
return (BigDecimal) get(15);
}
/**
@ -292,7 +262,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 46-50 в процентах
*/
public void set_46_50YearsPercent(BigDecimal value) {
set(18, value);
set(16, value);
}
/**
@ -300,7 +270,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 46-50 в процентах
*/
public BigDecimal get_46_50YearsPercent() {
return (BigDecimal) get(18);
return (BigDecimal) get(16);
}
/**
@ -308,7 +278,7 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 51+ в процентах
*/
public void set_51_2bYearsPercent(BigDecimal value) {
set(19, value);
set(17, value);
}
/**
@ -316,21 +286,49 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
* 51+ в процентах
*/
public BigDecimal get_51_2bYearsPercent() {
return (BigDecimal) get(19);
return (BigDecimal) get(17);
}
/**
* Setter for <code>total_registered.age.recruitment_id</code>.
*/
public void setRecruitmentId(String value) {
set(20, value);
set(18, value);
}
/**
* Getter for <code>total_registered.age.recruitment_id</code>.
*/
public String getRecruitmentId() {
return (String) get(20);
return (String) get(18);
}
/**
* Setter for <code>total_registered.age.registered</code>.
*/
public void setRegistered(String value) {
set(19, value);
}
/**
* Getter for <code>total_registered.age.registered</code>.
*/
public String getRegistered() {
return (String) get(19);
}
/**
* Setter for <code>total_registered.age.id_age</code>.
*/
public void setIdAge(Long value) {
set(20, value);
}
/**
* Getter for <code>total_registered.age.id_age</code>.
*/
public Long getIdAge() {
return (Long) get(20);
}
// -------------------------------------------------------------------------
@ -338,8 +336,8 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
public Record4<String, String, Date, String> key() {
return (Record4) super.key();
}
// -------------------------------------------------------------------------
@ -356,10 +354,9 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
/**
* Create a detached, initialised AgeRecord
*/
public AgeRecord(Long idAge, BigDecimal _17Yaers, BigDecimal _18_26Years, BigDecimal _27_30Years, BigDecimal _31_35Years, BigDecimal _36_40Years, BigDecimal _41_45Years, BigDecimal _51_2bYears, String allMW, Boolean registered, Date recordingDate, BigDecimal _46_50Years, BigDecimal _17YaersPercent, BigDecimal _18_26YearsPercent, BigDecimal _27_30YearsPercent, BigDecimal _31_35YearsPercent, BigDecimal _36_40YearsPercent, BigDecimal _41_45YearsPercent, BigDecimal _46_50YearsPercent, BigDecimal _51_2bYearsPercent, String recruitmentId) {
public AgeRecord(BigDecimal _17Yaers, BigDecimal _18_26Years, BigDecimal _27_30Years, BigDecimal _31_35Years, BigDecimal _36_40Years, BigDecimal _41_45Years, BigDecimal _51_2bYears, String allMW, Date recordingDate, BigDecimal _46_50Years, BigDecimal _17YaersPercent, BigDecimal _18_26YearsPercent, BigDecimal _27_30YearsPercent, BigDecimal _31_35YearsPercent, BigDecimal _36_40YearsPercent, BigDecimal _41_45YearsPercent, BigDecimal _46_50YearsPercent, BigDecimal _51_2bYearsPercent, String recruitmentId, String registered, Long idAge) {
super(Age.AGE);
setIdAge(idAge);
set_17Yaers(_17Yaers);
set_18_26Years(_18_26Years);
set_27_30Years(_27_30Years);
@ -368,7 +365,6 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
set_41_45Years(_41_45Years);
set_51_2bYears(_51_2bYears);
setAllMW(allMW);
setRegistered(registered);
setRecordingDate(recordingDate);
set_46_50Years(_46_50Years);
set_17YaersPercent(_17YaersPercent);
@ -380,6 +376,8 @@ public class AgeRecord extends UpdatableRecordImpl<AgeRecord> {
set_46_50YearsPercent(_46_50YearsPercent);
set_51_2bYearsPercent(_51_2bYearsPercent);
setRecruitmentId(recruitmentId);
setRegistered(registered);
setIdAge(idAge);
resetChangedOnNotNull();
}
}

View file

@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.ChildMinor
import java.math.BigDecimal;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.Record3;
import org.jooq.impl.UpdatableRecordImpl;
@ -21,74 +21,60 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>total_registered.child_minor.id_child_minor</code>.
*/
public void setIdChildMinor(Long value) {
set(0, value);
}
/**
* Getter for <code>total_registered.child_minor.id_child_minor</code>.
*/
public Long getIdChildMinor() {
return (Long) get(0);
}
/**
* Setter for <code>total_registered.child_minor.no_child</code>. Нет детей
*/
public void setNoChild(BigDecimal value) {
set(1, value);
set(0, value);
}
/**
* Getter for <code>total_registered.child_minor.no_child</code>. Нет детей
*/
public BigDecimal getNoChild() {
return (BigDecimal) get(1);
return (BigDecimal) get(0);
}
/**
* Setter for <code>total_registered.child_minor.1_child</code>. 1 ребенок
*/
public void set_1Child(BigDecimal value) {
set(2, value);
set(1, value);
}
/**
* Getter for <code>total_registered.child_minor.1_child</code>. 1 ребенок
*/
public BigDecimal get_1Child() {
return (BigDecimal) get(2);
return (BigDecimal) get(1);
}
/**
* Setter for <code>total_registered.child_minor.2_child</code>. 2 ребенка
*/
public void set_2Child(BigDecimal value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>total_registered.child_minor.2_child</code>. 2 ребенка
*/
public BigDecimal get_2Child() {
return (BigDecimal) get(3);
return (BigDecimal) get(2);
}
/**
* Setter for <code>total_registered.child_minor.3_child</code>. 3 ребенка
*/
public void set_3Child(BigDecimal value) {
set(4, value);
set(3, value);
}
/**
* Getter for <code>total_registered.child_minor.3_child</code>. 3 ребенка
*/
public BigDecimal get_3Child() {
return (BigDecimal) get(4);
return (BigDecimal) get(3);
}
/**
@ -96,7 +82,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* более
*/
public void set_4MoreChild(BigDecimal value) {
set(5, value);
set(4, value);
}
/**
@ -104,7 +90,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* более
*/
public BigDecimal get_4MoreChild() {
return (BigDecimal) get(5);
return (BigDecimal) get(4);
}
/**
@ -112,7 +98,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* Все/Мужчины/Женщины
*/
public void setAllMW(String value) {
set(6, value);
set(5, value);
}
/**
@ -120,7 +106,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* Все/Мужчины/Женщины
*/
public String getAllMW() {
return (String) get(6);
return (String) get(5);
}
/**
@ -128,7 +114,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* записи
*/
public void setRecordingDate(Date value) {
set(7, value);
set(6, value);
}
/**
@ -136,7 +122,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* записи
*/
public Date getRecordingDate() {
return (Date) get(7);
return (Date) get(6);
}
/**
@ -144,7 +130,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* Нет детей в процентах
*/
public void setNoChildPercent(BigDecimal value) {
set(8, value);
set(7, value);
}
/**
@ -152,7 +138,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* Нет детей в процентах
*/
public BigDecimal getNoChildPercent() {
return (BigDecimal) get(8);
return (BigDecimal) get(7);
}
/**
@ -160,7 +146,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенок в процентах
*/
public void set_1ChildPercent(BigDecimal value) {
set(9, value);
set(8, value);
}
/**
@ -168,7 +154,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенок в процентах
*/
public BigDecimal get_1ChildPercent() {
return (BigDecimal) get(9);
return (BigDecimal) get(8);
}
/**
@ -176,7 +162,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public void set_2ChildPercent(BigDecimal value) {
set(10, value);
set(9, value);
}
/**
@ -184,7 +170,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public BigDecimal get_2ChildPercent() {
return (BigDecimal) get(10);
return (BigDecimal) get(9);
}
/**
@ -192,7 +178,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public void set_3ChildPercent(BigDecimal value) {
set(11, value);
set(10, value);
}
/**
@ -200,7 +186,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public BigDecimal get_3ChildPercent() {
return (BigDecimal) get(11);
return (BigDecimal) get(10);
}
/**
@ -209,7 +195,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public void set_4MoreChildPercent(BigDecimal value) {
set(12, value);
set(11, value);
}
/**
@ -218,21 +204,35 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
* ребенка в процентах
*/
public BigDecimal get_4MoreChildPercent() {
return (BigDecimal) get(12);
return (BigDecimal) get(11);
}
/**
* Setter for <code>total_registered.child_minor.recruitment_id</code>.
*/
public void setRecruitmentId(String value) {
set(13, value);
set(12, value);
}
/**
* Getter for <code>total_registered.child_minor.recruitment_id</code>.
*/
public String getRecruitmentId() {
return (String) get(13);
return (String) get(12);
}
/**
* Setter for <code>total_registered.child_minor.id_child_minor</code>.
*/
public void setIdChildMinor(Long value) {
set(13, value);
}
/**
* Getter for <code>total_registered.child_minor.id_child_minor</code>.
*/
public Long getIdChildMinor() {
return (Long) get(13);
}
// -------------------------------------------------------------------------
@ -240,8 +240,8 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
public Record3<String, Date, String> key() {
return (Record3) super.key();
}
// -------------------------------------------------------------------------
@ -258,10 +258,9 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
/**
* Create a detached, initialised ChildMinorRecord
*/
public ChildMinorRecord(Long idChildMinor, BigDecimal noChild, BigDecimal _1Child, BigDecimal _2Child, BigDecimal _3Child, BigDecimal _4MoreChild, String allMW, Date recordingDate, BigDecimal noChildPercent, BigDecimal _1ChildPercent, BigDecimal _2ChildPercent, BigDecimal _3ChildPercent, BigDecimal _4MoreChildPercent, String recruitmentId) {
public ChildMinorRecord(BigDecimal noChild, BigDecimal _1Child, BigDecimal _2Child, BigDecimal _3Child, BigDecimal _4MoreChild, String allMW, Date recordingDate, BigDecimal noChildPercent, BigDecimal _1ChildPercent, BigDecimal _2ChildPercent, BigDecimal _3ChildPercent, BigDecimal _4MoreChildPercent, String recruitmentId, Long idChildMinor) {
super(ChildMinor.CHILD_MINOR);
setIdChildMinor(idChildMinor);
setNoChild(noChild);
set_1Child(_1Child);
set_2Child(_2Child);
@ -275,6 +274,7 @@ public class ChildMinorRecord extends UpdatableRecordImpl<ChildMinorRecord> {
set_3ChildPercent(_3ChildPercent);
set_4MoreChildPercent(_4MoreChildPercent);
setRecruitmentId(recruitmentId);
setIdChildMinor(idChildMinor);
resetChangedOnNotNull();
}
}

View file

@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.DriverLice
import java.math.BigDecimal;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.Record3;
import org.jooq.impl.UpdatableRecordImpl;
@ -22,28 +22,12 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
private static final long serialVersionUID = 1L;
/**
* Setter for
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public void setIdDriverLicense(Long value) {
set(0, value);
}
/**
* Getter for
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public Long getIdDriverLicense() {
return (Long) get(0);
}
/**
* Setter for <code>total_registered.driver_license.nope</code>. нет
* водительского удостоверения
*/
public void setNope(BigDecimal value) {
set(1, value);
set(0, value);
}
/**
@ -51,77 +35,77 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* водительского удостоверения
*/
public BigDecimal getNope() {
return (BigDecimal) get(1);
return (BigDecimal) get(0);
}
/**
* Setter for <code>total_registered.driver_license.A</code>. категория A
*/
public void setA(BigDecimal value) {
set(2, value);
set(1, value);
}
/**
* Getter for <code>total_registered.driver_license.A</code>. категория A
*/
public BigDecimal getA() {
return (BigDecimal) get(2);
return (BigDecimal) get(1);
}
/**
* Setter for <code>total_registered.driver_license.B</code>. категория B
*/
public void setB(BigDecimal value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>total_registered.driver_license.B</code>. категория B
*/
public BigDecimal getB() {
return (BigDecimal) get(3);
return (BigDecimal) get(2);
}
/**
* Setter for <code>total_registered.driver_license.C</code>. категория C
*/
public void setC(BigDecimal value) {
set(4, value);
set(3, value);
}
/**
* Getter for <code>total_registered.driver_license.C</code>. категория C
*/
public BigDecimal getC() {
return (BigDecimal) get(4);
return (BigDecimal) get(3);
}
/**
* Setter for <code>total_registered.driver_license.D</code>. категория D
*/
public void setD(BigDecimal value) {
set(5, value);
set(4, value);
}
/**
* Getter for <code>total_registered.driver_license.D</code>. категория D
*/
public BigDecimal getD() {
return (BigDecimal) get(5);
return (BigDecimal) get(4);
}
/**
* Setter for <code>total_registered.driver_license.E</code>. категория E
*/
public void setE(BigDecimal value) {
set(6, value);
set(5, value);
}
/**
* Getter for <code>total_registered.driver_license.E</code>. категория E
*/
public BigDecimal getE() {
return (BigDecimal) get(6);
return (BigDecimal) get(5);
}
/**
@ -129,7 +113,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* Все/Мужчины/Женщины
*/
public void setAllMW(String value) {
set(7, value);
set(6, value);
}
/**
@ -137,7 +121,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* Все/Мужчины/Женщины
*/
public String getAllMW() {
return (String) get(7);
return (String) get(6);
}
/**
@ -145,7 +129,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* Дата записи
*/
public void setRecordingDate(Date value) {
set(8, value);
set(7, value);
}
/**
@ -153,7 +137,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* Дата записи
*/
public Date getRecordingDate() {
return (Date) get(8);
return (Date) get(7);
}
/**
@ -161,7 +145,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* водительского удостоверения в процентах
*/
public void setNopeRepcent(BigDecimal value) {
set(9, value);
set(8, value);
}
/**
@ -169,7 +153,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* водительского удостоверения в процентах
*/
public BigDecimal getNopeRepcent() {
return (BigDecimal) get(9);
return (BigDecimal) get(8);
}
/**
@ -177,7 +161,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория A в процентах
*/
public void setARepcent(BigDecimal value) {
set(10, value);
set(9, value);
}
/**
@ -185,7 +169,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория A в процентах
*/
public BigDecimal getARepcent() {
return (BigDecimal) get(10);
return (BigDecimal) get(9);
}
/**
@ -193,7 +177,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория B в процентах
*/
public void setBRepcent(BigDecimal value) {
set(11, value);
set(10, value);
}
/**
@ -201,7 +185,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория B в процентах
*/
public BigDecimal getBRepcent() {
return (BigDecimal) get(11);
return (BigDecimal) get(10);
}
/**
@ -209,7 +193,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория C в процентах
*/
public void setCRepcent(BigDecimal value) {
set(12, value);
set(11, value);
}
/**
@ -217,7 +201,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория C в процентах
*/
public BigDecimal getCRepcent() {
return (BigDecimal) get(12);
return (BigDecimal) get(11);
}
/**
@ -225,7 +209,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория D в процентах
*/
public void setDRepcent(BigDecimal value) {
set(13, value);
set(12, value);
}
/**
@ -233,7 +217,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория D в процентах
*/
public BigDecimal getDRepcent() {
return (BigDecimal) get(13);
return (BigDecimal) get(12);
}
/**
@ -241,7 +225,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория E в процентах
*/
public void setERepcent(BigDecimal value) {
set(14, value);
set(13, value);
}
/**
@ -249,21 +233,37 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
* категория E в процентах
*/
public BigDecimal getERepcent() {
return (BigDecimal) get(14);
return (BigDecimal) get(13);
}
/**
* Setter for <code>total_registered.driver_license.recruitment_id</code>.
*/
public void setRecruitmentId(String value) {
set(15, value);
set(14, value);
}
/**
* Getter for <code>total_registered.driver_license.recruitment_id</code>.
*/
public String getRecruitmentId() {
return (String) get(15);
return (String) get(14);
}
/**
* Setter for
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public void setIdDriverLicense(Long value) {
set(15, value);
}
/**
* Getter for
* <code>total_registered.driver_license.id_driver_license</code>.
*/
public Long getIdDriverLicense() {
return (Long) get(15);
}
// -------------------------------------------------------------------------
@ -271,8 +271,8 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
public Record3<String, String, Date> key() {
return (Record3) super.key();
}
// -------------------------------------------------------------------------
@ -289,10 +289,9 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
/**
* Create a detached, initialised DriverLicenseRecord
*/
public DriverLicenseRecord(Long idDriverLicense, BigDecimal nope, BigDecimal a, BigDecimal b, BigDecimal c, BigDecimal d, BigDecimal e, String allMW, Date recordingDate, BigDecimal nopeRepcent, BigDecimal aRepcent, BigDecimal bRepcent, BigDecimal cRepcent, BigDecimal dRepcent, BigDecimal eRepcent, String recruitmentId) {
public DriverLicenseRecord(BigDecimal nope, BigDecimal a, BigDecimal b, BigDecimal c, BigDecimal d, BigDecimal e, String allMW, Date recordingDate, BigDecimal nopeRepcent, BigDecimal aRepcent, BigDecimal bRepcent, BigDecimal cRepcent, BigDecimal dRepcent, BigDecimal eRepcent, String recruitmentId, Long idDriverLicense) {
super(DriverLicense.DRIVER_LICENSE);
setIdDriverLicense(idDriverLicense);
setNope(nope);
setA(a);
setB(b);
@ -308,6 +307,7 @@ public class DriverLicenseRecord extends UpdatableRecordImpl<DriverLicenseRecord
setDRepcent(dRepcent);
setERepcent(eRepcent);
setRecruitmentId(recruitmentId);
setIdDriverLicense(idDriverLicense);
resetChangedOnNotNull();
}
}

View file

@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.total_registered.tables.Subpoenas;
import java.math.BigDecimal;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.Record3;
import org.jooq.impl.UpdatableRecordImpl;
@ -21,26 +21,12 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>total_registered.subpoenas.id_subpoena</code>.
*/
public void setIdSubpoena(Long value) {
set(0, value);
}
/**
* Getter for <code>total_registered.subpoenas.id_subpoena</code>.
*/
public Long getIdSubpoena() {
return (Long) get(0);
}
/**
* Setter for <code>total_registered.subpoenas.subpoena</code>. Направлено
* повесток
*/
public void setSubpoena(BigDecimal value) {
set(1, value);
set(0, value);
}
/**
@ -48,7 +34,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* повесток
*/
public BigDecimal getSubpoena() {
return (BigDecimal) get(1);
return (BigDecimal) get(0);
}
/**
@ -56,7 +42,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Средний срок явки
*/
public void setAverageAppeared(BigDecimal value) {
set(2, value);
set(1, value);
}
/**
@ -64,21 +50,21 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Средний срок явки
*/
public BigDecimal getAverageAppeared() {
return (BigDecimal) get(2);
return (BigDecimal) get(1);
}
/**
* Setter for <code>total_registered.subpoenas.appeared</code>. Явились
*/
public void setAppeared(BigDecimal value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>total_registered.subpoenas.appeared</code>. Явились
*/
public BigDecimal getAppeared() {
return (BigDecimal) get(3);
return (BigDecimal) get(2);
}
/**
@ -86,7 +72,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились
*/
public void setNotAppeared(BigDecimal value) {
set(4, value);
set(3, value);
}
/**
@ -94,7 +80,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились
*/
public BigDecimal getNotAppeared() {
return (BigDecimal) get(4);
return (BigDecimal) get(3);
}
/**
@ -102,7 +88,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились по уважительной причине
*/
public void setNotApGoodReason(BigDecimal value) {
set(5, value);
set(4, value);
}
/**
@ -110,7 +96,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились по уважительной причине
*/
public BigDecimal getNotApGoodReason() {
return (BigDecimal) get(5);
return (BigDecimal) get(4);
}
/**
@ -118,7 +104,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* не требуется
*/
public void setApNotRequired(BigDecimal value) {
set(6, value);
set(5, value);
}
/**
@ -126,35 +112,35 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* не требуется
*/
public BigDecimal getApNotRequired() {
return (BigDecimal) get(6);
return (BigDecimal) get(5);
}
/**
* Setter for <code>total_registered.subpoenas.electron</code>. Электронно
*/
public void setElectron(BigDecimal value) {
set(7, value);
set(6, value);
}
/**
* Getter for <code>total_registered.subpoenas.electron</code>. Электронно
*/
public BigDecimal getElectron() {
return (BigDecimal) get(7);
return (BigDecimal) get(6);
}
/**
* Setter for <code>total_registered.subpoenas.paper</code>. Нарочно
*/
public void setPaper(BigDecimal value) {
set(8, value);
set(7, value);
}
/**
* Getter for <code>total_registered.subpoenas.paper</code>. Нарочно
*/
public BigDecimal getPaper() {
return (BigDecimal) get(8);
return (BigDecimal) get(7);
}
/**
@ -162,7 +148,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Применено ограничений
*/
public void setRestrictionsApplied(BigDecimal value) {
set(9, value);
set(8, value);
}
/**
@ -170,7 +156,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Применено ограничений
*/
public BigDecimal getRestrictionsApplied() {
return (BigDecimal) get(9);
return (BigDecimal) get(8);
}
/**
@ -178,7 +164,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Введено реализатором мер
*/
public void setIntroducedMeasures(BigDecimal value) {
set(10, value);
set(9, value);
}
/**
@ -186,7 +172,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Введено реализатором мер
*/
public BigDecimal getIntroducedMeasures() {
return (BigDecimal) get(10);
return (BigDecimal) get(9);
}
/**
@ -194,7 +180,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* записи
*/
public void setRecordingDate(Date value) {
set(11, value);
set(10, value);
}
/**
@ -202,7 +188,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* записи
*/
public Date getRecordingDate() {
return (Date) get(11);
return (Date) get(10);
}
/**
@ -210,7 +196,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Явились в процентах
*/
public void setAppearedPercent(BigDecimal value) {
set(12, value);
set(11, value);
}
/**
@ -218,7 +204,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Явились в процентах
*/
public BigDecimal getAppearedPercent() {
return (BigDecimal) get(12);
return (BigDecimal) get(11);
}
/**
@ -226,7 +212,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Не явились в процентах
*/
public void setNotAppearedPercent(BigDecimal value) {
set(13, value);
set(12, value);
}
/**
@ -234,7 +220,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Не явились в процентах
*/
public BigDecimal getNotAppearedPercent() {
return (BigDecimal) get(13);
return (BigDecimal) get(12);
}
/**
@ -243,7 +229,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились по уважительной причине в процентах
*/
public void setNotApGoodReasonPercent(BigDecimal value) {
set(14, value);
set(13, value);
}
/**
@ -252,7 +238,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* явились по уважительной причине в процентах
*/
public BigDecimal getNotApGoodReasonPercent() {
return (BigDecimal) get(14);
return (BigDecimal) get(13);
}
/**
@ -261,7 +247,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* требуется в процентах
*/
public void setApNotRequiredPercent(BigDecimal value) {
set(15, value);
set(14, value);
}
/**
@ -270,7 +256,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* требуется в процентах
*/
public BigDecimal getApNotRequiredPercent() {
return (BigDecimal) get(15);
return (BigDecimal) get(14);
}
/**
@ -278,7 +264,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Электронно в процентах
*/
public void setElectronPercent(BigDecimal value) {
set(16, value);
set(15, value);
}
/**
@ -286,7 +272,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Электронно в процентах
*/
public BigDecimal getElectronPercent() {
return (BigDecimal) get(16);
return (BigDecimal) get(15);
}
/**
@ -294,7 +280,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* в процентах
*/
public void setPaperPercent(BigDecimal value) {
set(17, value);
set(16, value);
}
/**
@ -302,7 +288,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* в процентах
*/
public BigDecimal getPaperPercent() {
return (BigDecimal) get(17);
return (BigDecimal) get(16);
}
/**
@ -311,7 +297,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Применено ограничений в процентах
*/
public void setRestrictionsAppliedPercent(BigDecimal value) {
set(18, value);
set(17, value);
}
/**
@ -320,7 +306,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Применено ограничений в процентах
*/
public BigDecimal getRestrictionsAppliedPercent() {
return (BigDecimal) get(18);
return (BigDecimal) get(17);
}
/**
@ -329,7 +315,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Введено реализатором мер в процентах
*/
public void setIntroducedMeasuresPercent(BigDecimal value) {
set(19, value);
set(18, value);
}
/**
@ -338,35 +324,49 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
* Введено реализатором мер в процентах
*/
public BigDecimal getIntroducedMeasuresPercent() {
return (BigDecimal) get(19);
return (BigDecimal) get(18);
}
/**
* Setter for <code>total_registered.subpoenas.recruitment_id</code>.
*/
public void setRecruitmentId(String value) {
set(20, value);
set(19, value);
}
/**
* Getter for <code>total_registered.subpoenas.recruitment_id</code>.
*/
public String getRecruitmentId() {
return (String) get(20);
return (String) get(19);
}
/**
* Setter for <code>total_registered.subpoenas.mil_reg</code>.
*/
public void setMilReg(BigDecimal value) {
set(21, value);
set(20, value);
}
/**
* Getter for <code>total_registered.subpoenas.mil_reg</code>.
*/
public BigDecimal getMilReg() {
return (BigDecimal) get(21);
return (BigDecimal) get(20);
}
/**
* Setter for <code>total_registered.subpoenas.id_subpoena</code>.
*/
public void setIdSubpoena(Long value) {
set(21, value);
}
/**
* Getter for <code>total_registered.subpoenas.id_subpoena</code>.
*/
public Long getIdSubpoena() {
return (Long) get(21);
}
// -------------------------------------------------------------------------
@ -374,8 +374,8 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
public Record3<BigDecimal, String, Date> key() {
return (Record3) super.key();
}
// -------------------------------------------------------------------------
@ -392,10 +392,9 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
/**
* Create a detached, initialised SubpoenasRecord
*/
public SubpoenasRecord(Long idSubpoena, BigDecimal subpoena, BigDecimal averageAppeared, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal electron, BigDecimal paper, BigDecimal restrictionsApplied, BigDecimal introducedMeasures, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal electronPercent, BigDecimal paperPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal milReg) {
public SubpoenasRecord(BigDecimal subpoena, BigDecimal averageAppeared, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal electron, BigDecimal paper, BigDecimal restrictionsApplied, BigDecimal introducedMeasures, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal electronPercent, BigDecimal paperPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal milReg, Long idSubpoena) {
super(Subpoenas.SUBPOENAS);
setIdSubpoena(idSubpoena);
setSubpoena(subpoena);
setAverageAppeared(averageAppeared);
setAppeared(appeared);
@ -417,6 +416,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl<SubpoenasRecord> {
setIntroducedMeasuresPercent(introducedMeasuresPercent);
setRecruitmentId(recruitmentId);
setMilReg(milReg);
setIdSubpoena(idSubpoena);
resetChangedOnNotNull();
}
}

1
config/.gitignore vendored
View file

@ -1,2 +1,3 @@
/*.ear
/*.jar
/*.war

View file

@ -1,44 +1,46 @@
FROM quay.io/wildfly/wildfly:26.1.3.Final-jdk17
USER root
ARG POSTGRES_DRIVER_VERSION=42.7.3
RUN yum-config-manager --disable base --disable extras --disable updates \
&& yum-config-manager --enable C7.8.2003-base --enable C7.8.2003-extras --enable C7.8.2003-updates \
&& yum -y --disableplugin=fastestmirror install sudo \
&& chown -R jboss: /opt/jboss/
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
ARG BACKEND_IMAGE=tomee:8.0.16-jre17-webprofile
ARG FRONTEND_IMAGE=docker.angie.software/angie:latest
USER jboss
WORKDIR $JBOSS_HOME
ENV JAVA_ARGS=-Xmx3g
RUN echo 'JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,address=*:8787,server=y,suspend=n"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=1g"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.logmanager.nocolor=true"' >> bin/standalone.conf && \
echo 'JAVA_OPTS="$JAVA_OPTS $JAVA_ARGS"' >> bin/standalone.conf
FROM $BUILDER_IMAGE AS builder
### Locale support ru_RU ###
USER root
RUN localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
RUN echo "LANG=\"ru_RU.UTF-8\"" > /etc/locale.conf
USER jboss
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU.UTF-8
ENV LC_ALL ru_RU.UTF-8
### Locale Support END ###
ARG MVN_FLAGS="-Pprod"
COPY --chown=jboss entrypoint.sh .
COPY --chown=jboss patches patches
RUN (cd patches && wget https://repo.micord.ru/repository/libs-releases-local/org/jboss/ironjacamar/ironjacamar-core-impl/1.5.3.Final/ironjacamar-core-impl-1.5.3.Final.jar)
RUN (cd patches/system && wget https://repo1.maven.org/maven2/org/postgresql/postgresql/$POSTGRES_DRIVER_VERSION/postgresql-$POSTGRES_DRIVER_VERSION.jar -O postgresql-driver.jar)
RUN apt-get update \
&& apt-get -y install git glibc-locales java-17-openjdk-devel maven node \
&& apt-get clean
RUN chmod -R +x patches && \
chmod +x entrypoint.sh && \
./entrypoint.sh && \
rm -rf patches
ENV JAVA_HOME=/usr/lib/jvm/java
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU.UTF-8
ENV LC_ALL=ru_RU.UTF-8
ENV SERVER_START=true
COPY --chown=jboss *.ear $JBOSS_HOME/standalone/deployments/
WORKDIR /app
COPY . .
RUN mkdir -p $HOME/.m2 \
# && cp -f config/pgs-settings.xml $HOME/.m2/settings.xml \
# && cp -f config/pgs-npmrc frontend/.npmrc \
&& mvn clean \
&& mvn package -T4C ${MVN_FLAGS}
HEALTHCHECK --timeout=3s --start-period=3600s CMD curl --fail 127.0.0.1:8080/dashboard/version || exit 1
FROM $BACKEND_IMAGE AS backend
FROM $BACKEND_IMAGE AS backend
ARG ADMIN_PASSWORD=Secr3t
COPY config/tomcat/tomee /usr/local/tomee
RUN rm -rf /usr/local/tomee/webapps/ROOT \
&& cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
COPY --from=builder /app/backend/target/dashboard.war /usr/local/tomee/webapps/dashboard.war
FROM backend AS combo
COPY --from=builder /app/frontend/target/frontend*.war /usr/local/tomee/webapps/ROOT.war
FROM $FRONTEND_IMAGE AS frontend
COPY config/angie.conf /etc/angie/angie.conf
COPY --from=builder /app/frontend/dist /frontend

13
config/Dockerfile.TC Normal file
View file

@ -0,0 +1,13 @@
#Dockerfile for TeamCity build "run in docker"
FROM tomee:8.0.16-jre17-webprofile
ARG ADMIN_PASSWORD=Secr3t
COPY tomcat/tomee /usr/local/tomee
RUN rm -rf /usr/local/tomee/webapps/ROOT \
&& cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
COPY frontend.war /usr/local/tomee/webapps/ROOT.war
COPY dashboard.war /usr/local/tomee/webapps/dashboard.war

35
config/Dockerfile.backend Normal file
View file

@ -0,0 +1,35 @@
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
ARG RUNTIME_IMAGE=tomee:8.0.16-jre17-webprofile
FROM $BUILDER_IMAGE AS builder
ARG MVN_FLAGS="-Pprod"
RUN apt-get update \
&& apt-get -y install git glibc-locales java-17-openjdk-devel maven node \
&& apt-get clean
ENV JAVA_HOME=/usr/lib/jvm/java
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU.UTF-8
ENV LC_ALL=ru_RU.UTF-8
WORKDIR /app
COPY . .
RUN mkdir -p $HOME/.m2 \
# && cp -f config/pgs-settings.xml $HOME/.m2/settings.xml \
# && cp -f config/pgs-npmrc frontend/.npmrc \
&& mvn clean \
&& mvn package -T4C ${MVN_FLAGS}
FROM $RUNTIME_IMAGE
ARG ADMIN_PASSWORD=Secr3t
COPY config/tomcat/tomee /usr/local/tomee
RUN rm -rf /usr/local/tomee/webapps/ROOT \
&& cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomee/webapps/dashboard.war

View file

@ -1,10 +0,0 @@
FROM maven:3-jdk-11-slim
RUN apt update \
&& apt upgrade -y \
&& curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
&& apt install -y git nodejs \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY ../ .
RUN mvn clean -T4C && mvn package -T4C

View file

@ -0,0 +1,29 @@
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
ARG RUNTIME_IMAGE=docker.angie.software/angie:latest
FROM $BUILDER_IMAGE AS builder
ARG MVN_FLAGS="-Pprod"
RUN apt-get update \
&& apt-get -y install git glibc-locales java-17-openjdk-devel maven node \
&& apt-get clean
ENV JAVA_HOME=/usr/lib/jvm/java
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU.UTF-8
ENV LC_ALL=ru_RU.UTF-8
WORKDIR /app
COPY . .
RUN mkdir -p $HOME/.m2 \
# && cp config/pgs-settings.xml $HOME/.m2/settings.xml \
# && cp -f config/pgs-npmrc frontend/.npmrc \
&& mvn clean \
&& mvn package -T4C ${MVN_FLAGS}
FROM $RUNTIME_IMAGE
COPY config/angie.conf /etc/angie/angie.conf
COPY --from=builder /app/frontend/dist /frontend

View file

@ -1,5 +0,0 @@
FROM postgres:11-alpine
COPY secdb.sql .
CMD psql "postgresql://${DB_SEC_USERNAME:-security}:${DB_SEC_PASSWORD:-secpassword}@${DB_SEC_HOST:-db}/${DB_SEC_NAME:-security}" < secdb.sql

View file

@ -1 +0,0 @@
17

84
config/angie.conf Normal file
View file

@ -0,0 +1,84 @@
include /etc/angie/modules-enabled.d/*.conf;
worker_processes 10;
error_log /var/log/angie/error.log;
events {
worker_connections 1024;
}
include /etc/angie/conf-enabled.d/*.conf;
http {
include /etc/angie/mime.types;
default_type application/octet-stream;
sendfile on;
gzip on;
# text/html doesn't need to be defined there, it's compressed always
gzip_types text/plain text/css text/xml application/x-javascript application/atom+xml;
# gzip_comp_level 9;
include /etc/angie/sites-enabled.d/*.conf;
log_format angie_main
'$remote_addr - $remote_user [$time_local] $request '
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for" '
'"$request_filename" "$gzip_ratio" $upstream_response_time server: $host : $document_root $fastcgi_script_name ';
server {
listen 80 default;
access_log /var/log/angie/access.log angie_main;
error_log /var/log/angie/error.log error;
charset utf-8;
client_max_body_size 32m;
##
# `gzip` Settings
#
#
gzip on;
gzip_disable "msie6";
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_min_length 256;
gzip_types
application/atom+xml
application/geo+json
application/javascript
application/x-javascript
application/json
application/ld+json
application/manifest+json
application/rdf+xml
application/rss+xml
application/xhtml+xml
application/xml
font/eot
font/otf
font/ttf
image/svg+xml
text/css
text/javascript
text/plain
text/xml;
location / {
root /frontend;
index index.html;
expires -1;
try_files $uri $uri/ $uri/index.html;
}
}
}

View file

@ -1,31 +0,0 @@
{
"firefox": {
"default": "112.0",
"versions": {
"112.0": {
"image": "selenoid/firefox:112.0",
"port": "4444",
"path": "/wd/hub",
"tmpfs": {
"/tmp": "size=512m"
},
"env" : ["LANG=ru_RU.UTF-8", "LANGUAGE=ru:en", "LC_ALL=ru_RU.UTF-8"],
"shmSize": 1073741824
}
}
},
"chrome": {
"default": "121.0",
"versions": {
"121.0": {
"image": "selenoid/chrome:121.0",
"port": "4444",
"tmpfs": {
"/tmp": "size=512m"
},
"env" : ["LANG=ru_RU.UTF-8", "LANGUAGE=ru:en", "LC_ALL=ru_RU.UTF-8"],
"shmSize": 1073741824
}
}
}
}

View file

@ -1,12 +0,0 @@
#!/bin/bash
set -e
IFS=','
for databases in $WILDFLY_DATABASES
do
IFS=':' read name user password <<< $databases
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER $user WITH PASSWORD '$password';
CREATE DATABASE $name WITH OWNER $user;
EOSQL
done

View file

@ -1,12 +0,0 @@
version: "3"
services:
secdb:
build:
context: .
dockerfile: Dockerfile.secdb
depends_on:
- db
env_file:
- testing.env
labels:
- "tmp=true"

View file

@ -1,28 +0,0 @@
version: "3"
services:
selenoid:
network_mode: bridge
image: aerokube/selenoid:latest-release
container_name: "selenoid"
environment:
- OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/video
volumes:
- ".:/etc/selenoid/:ro"
- "/var/run/docker.sock:/var/run/docker.sock"
- "./logs:/opt/selenoid/logs/"
- "./video/:/opt/selenoid/video/"
command: -session-attempt-timeout 1m -retry-count 3 -limit ${LIMIT:-4} -save-all-logs -log-output-dir /opt/selenoid/logs -video-output-dir /opt/selenoid/video
ports:
- "4444:4444"
selenoid-ui:
image: aerokube/selenoid-ui
container_name: "selenoid-ui"
network_mode: bridge
depends_on:
- selenoid
links:
- "selenoid:selenoid"
ports:
- "8080:8080"
command: --selenoid-uri http://selenoid:4444`

View file

@ -1,41 +0,0 @@
version: "3"
services:
db:
ports:
- 5432:5432
environment:
- WILDFLY_DATABASES=app:app_user:apppassword,security:security_user:secpassword,jbpm:jbpm:jbpmpassword
webbpm-app:
env_file:
- testing.env
selenoid:
network_mode: bridge
image: aerokube/selenoid:latest-release
container_name: "selenoid"
environment:
- OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/video
volumes:
- "$PWD:/etc/selenoid/:ro"
- "/var/run/docker.sock:/var/run/docker.sock"
- "$PWD/logs:/opt/selenoid/logs/"
- "$PWD/video/:/opt/selenoid/video/"
command: -session-attempt-timeout 1m -retry-count 3 -limit ${LIMIT:-4} -save-all-logs -log-output-dir /opt/selenoid/logs -video-output-dir /opt/selenoid/video
ports:
- "4444:4444"
depends_on:
- webbpm-app
selenoid-ui:
image: aerokube/selenoid-ui
container_name: "selenoid-ui"
network_mode: bridge
depends_on:
- selenoid
links:
- "selenoid:selenoid"
ports:
- "8080:8080"
command: --selenoid-uri http://selenoid:4444

View file

@ -1,31 +0,0 @@
version: "3"
services:
db:
image: postgres:15-bullseye
volumes:
- ./config/create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
command:
- "--max_prepared_transactions=100"
ports:
- 5432
environment:
- WILDFLY_DATABASES=security:security_user:secpassword,jbpm:jbpm:jbpmpassword
- POSTGRES_PASSWORD=supersecretpassword
labels:
- "tmp=true"
webbpm-app:
build:
context: ./..
dockerfile: Dockerfile
depends_on:
- db
ports:
- 9990
- 8080
- 8787
- 12345
env_file:
- testing.env
labels:
- "tmp=true"

View file

@ -1,31 +1,10 @@
version: "3"
services:
db:
image: postgres:15-bullseye
volumes:
- ./create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
command:
- "--max_prepared_transactions=100"
ports:
- 5432
environment:
- WILDFLY_DATABASES=security:security_user:secpassword,jbpm:jbpm:jbpmpassword
- POSTGRES_PASSWORD=supersecretpassword
labels:
- "tmp=true"
webbpm-app:
build:
context: .
dockerfile: Dockerfile
depends_on:
- db
dockerfile: Dockerfile.TC
ports:
- 9990
- 8080
- 8787
- 12345
env_file:
- testing.env
labels:
- "tmp=true"
- micord.env

View file

@ -1,48 +0,0 @@
#! /bin/bash
set -e
function wait_for_server() {
until `$JBOSS_HOME/bin/jboss-cli.sh -c ":read-attribute(name=server-state)" 2> /dev/null | grep -q running`; do
echo "Retry ..."
done
}
echo "dump environment variables to env.properties file"
printenv > env.properties
echo "starting JBoss"
nohup $JBOSS_HOME/bin/standalone.sh --admin-only 1>&2 2>/dev/null &
# running system patches
wait_for_server
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/init.cli" --properties=env.properties
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="./patches/system/add-postgresql-driver.cli" --properties=env.properties
bash "./patches/system/add-demo-user.sh"
# running project patches
find ./patches/ -type f -name '*.cli' -not -path './patches/system/*' -print0 |
while IFS= read -r -d '' f; do
wait_for_server
echo "running $f"
$JBOSS_HOME/bin/jboss-cli.sh --connect --file="$f" --properties=env.properties
done;
find ./patches/ -type f -name '*.sh' -not -path './patches/system/*' -print0 |
while IFS= read -r -d '' f; do
wait_for_server
echo "running $f"
bash "$f"
done
echo "stopping JBoss"
wait_for_server
$JBOSS_HOME/bin/jboss-cli.sh --connect --command=:shutdown
if ! [[ -z $SERVER_START ]]; then
echo "starting JBoss in standalone"
sleep 10 # without this occurs error "address already in use"
/opt/jboss/wildfly/bin/standalone.sh -c standalone.xml -b 0.0.0.0 -bmanagement 0.0.0.0
else
echo "cleaning up JBoss logs"
rm -rf $JBOSS_HOME/standalone/log
fi

7
config/micord.env Normal file
View file

@ -0,0 +1,7 @@
TZ=Europe/Moscow
# App datasource
DB_APP_USERNAME=ervu-dashboard
DB_APP_PASSWORD=ervu-dashboard
DB_APP_HOST=10.10.31.119
DB_APP_PORT=5432
DB_APP_NAME=ervu-dashboard

View file

@ -1,3 +0,0 @@
/subsystem=logging/logger=org.jooq.tools:add()
/subsystem=logging/logger=org.jooq.tools:write-attribute(name=level, value=DEBUG)
/subsystem=logging/logger=org.jooq.tools:add-handler(name=CONSOLE)

View file

@ -1,30 +0,0 @@
xa-data-source add \
--name=AppDS \
--enabled=true \
--driver-name=postgresql \
--jndi-name=java:/webbpm/AppDS \
--user-name=${env.DB_APP_USERNAME:app_user} \
--password=${env.DB_APP_PASSWORD:apppassword} \
--use-ccm=true \
--valid-connection-checker-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker \
--validate-on-match=false \
--background-validation=true \
--background-validation-millis=5000 \
--exception-sorter-class-name=org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter \
--statistics-enabled=true \
--max-pool-size=50 \
--query-timeout=300 \
--xa-datasource-properties=ServerName=${env.DB_APP_HOST:db},PortNumber=${env.DB_APP_PORT:5432},DatabaseName=${env.DB_APP_NAME:app}
/system-property=ldap.mapping.login.param:add(value=${env.WEBBPM_LDAP_LOGIN_ATTR:uid})
/system-property=ldap.mapping.org.code.param:add(value=${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou})
/system-property=jboss.as.management.blocking.timeout:add(value=900)
/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=record-request-start-time,value=true)
/subsystem=undertow/server=default-server/host=default-host/setting=access-log:add(pattern=%h %t "%r" %s %b %D)
/system-property=webbpm.cache.hazelcast.hosts:add(value="127.0.0.1")
/system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820")
/system-property=webbpm.security.session.active.count:add(value="20")
/system-property=gar.enable:add(value=false)
/system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$")
/system-property=fias.enable:add(value=false)
/system-property=bpmn.enable:add(value=false)

View file

@ -1 +0,0 @@
$JBOSS_HOME/bin/add-user.sh demo@example.com demo

View file

@ -1,5 +0,0 @@
/subsystem=datasources/jdbc-driver=postgresql:add( \
driver-name="postgresql", \
driver-module-name="org.postgresql", \
driver-xa-datasource-class-name="org.postgresql.xa.PGXADataSource" \
)

View file

@ -1,14 +0,0 @@
/system-property=webbpm.mode:add(value=production)
/system-property=authentication.method:add(value=form)
/subsystem=undertow/configuration=filter/gzip=gzipFilter:add()
/subsystem=undertow/server=default-server/host=default-host/\
filter-ref=gzipFilter:add(predicate="exists('%{o,Content-Type}') and regex(pattern='(?:application/javascript|text/css|text/html|text/xml|application/json)(;.*)?', value=%{o,Content-Type}, full-match=true)")
/subsystem=undertow/configuration=filter/response-header=vary-header:add(header-name="Vary", header-value="Accept-Encoding")
/subsystem=undertow/server=default-server/host=default-host/filter-ref=vary-header:add()
/subsystem=undertow/server=default-server/http-listener=default/:write-attribute(name=max-post-size,value=${env.MAX_POST_SIZE:104857600})
data-source remove --name=ExampleDS
/subsystem=ee/service=default-bindings:remove
/system-property=jboss.bind.address.management:add(value=0.0.0.0)
/system-property=jboss.bind.address:add(value=0.0.0.0)
module add --name=org.postgresql --resources=./patches/system/postgresql-driver.jar --dependencies=javax.api,javax.transaction.api
shutdown --restart

View file

@ -1,25 +0,0 @@
INSERT INTO security.user_group(user_group_id, name, created, updated, access_level_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'Example', '2019-07-04 11:12:01.263+03', '2019-08-26 16:40:11.953+03', (SELECT access_level_id FROM security.access_level where level = 0)) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Example'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Demo'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING;
INSERT INTO security.user_group(user_group_id, name, created, updated, access_level_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'Example', '2019-07-04 11:12:01.263+03', '2019-08-26 16:40:11.953+03', (SELECT access_level_id FROM security.access_level where level = 0)) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Example'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_group_user_role(link_user_group_user_role_id, user_group_id, user_role_id) SELECT uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_group_id FROM security.user_group where name = 'Demo'), user_role_id FROM security.user_role WHERE name = 'Example' ON CONFLICT DO NOTHING;
INSERT INTO security.user_account(user_account_id, email, first_name, last_name, middle_name, created, updated, locked, org_unit_id, username) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'qa_test@micord.ru', 'Пользователь', 'Основной-Тестовый', NULL, '2020-01-20 08:41:25.526+03', '2020-01-20 09:57:07.25+03', false, (SELECT id from security.org_unit where code = 'DEFAULT'), 'qa_test') ON CONFLICT DO NOTHING;
INSERT INTO security.simple_credentials( user_account_id, password, password_expires, password_updated) VALUES ((SELECT user_account_id from security.user_account where username = 'qa_test'), '$2a$11$uTzaeewDp2NehwjmfRe/euxP.cy.4ecl5nYA.E5TV9AGjjDKdJwI2', NULL, '2020-01-20 05:41:25.746') ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Security Admin')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Superuser')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Admin')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Example')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'BPMN User')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_test'), (SELECT user_group_id FROM security.user_group where name = 'Demo')) ON CONFLICT DO NOTHING;
INSERT INTO security.user_account(user_account_id, email, first_name, last_name, middle_name, created, updated, locked, org_unit_id, username) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), 'qa_admin@micord.ru', 'qa_admin', 'qa_admin', NULL, '2020-01-20 08:41:25.526+03', '2020-01-20 09:57:07.25+03', false, (SELECT id from security.org_unit where code = 'DEFAULT'), 'qa_admin') ON CONFLICT DO NOTHING;
INSERT INTO security.simple_credentials( user_account_id, password, password_expires, password_updated) VALUES ((SELECT user_account_id from security.user_account where username = 'qa_admin'), '$2a$11$Zzmuga/xw1c1UnUe9nP9c.aqJ2O.OAI/AbmphOm2jurxMI0S6VAcy', NULL, '2020-01-20 05:41:25.746') ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Security Admin')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Superuser')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN Admin')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Example')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'BPMN User')) ON CONFLICT DO NOTHING;
INSERT INTO security.link_user_account_user_group(link_user_account_user_group_id, user_account_id, user_group_id) VALUES (uuid_in(md5(random()::text || now()::text)::cstring), (SELECT user_account_id from security.user_account where username = 'qa_admin'), (SELECT user_group_id FROM security.user_group where name = 'Demo')) ON CONFLICT DO NOTHING;

View file

@ -1,561 +0,0 @@
<?xml version="1.0" ?>
<server xmlns="urn:jboss:domain:19.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.ee"/>
<extension module="org.jboss.as.ejb3"/>
<extension module="org.jboss.as.jaxrs"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
<extension module="org.jboss.as.jpa"/>
<extension module="org.jboss.as.jsf"/>
<extension module="org.jboss.as.logging"/>
<extension module="org.jboss.as.mail"/>
<extension module="org.jboss.as.naming"/>
<extension module="org.jboss.as.pojo"/>
<extension module="org.jboss.as.remoting"/>
<extension module="org.jboss.as.sar"/>
<extension module="org.jboss.as.transactions"/>
<extension module="org.jboss.as.webservices"/>
<extension module="org.jboss.as.weld"/>
<extension module="org.wildfly.extension.batch.jberet"/>
<extension module="org.wildfly.extension.bean-validation"/>
<extension module="org.wildfly.extension.clustering.web"/>
<extension module="org.wildfly.extension.core-management"/>
<extension module="org.wildfly.extension.discovery"/>
<extension module="org.wildfly.extension.ee-security"/>
<extension module="org.wildfly.extension.elytron"/>
<extension module="org.wildfly.extension.elytron-oidc-client"/>
<extension module="org.wildfly.extension.health"/>
<extension module="org.wildfly.extension.io"/>
<extension module="org.wildfly.extension.metrics"/>
<extension module="org.wildfly.extension.microprofile.config-smallrye"/>
<extension module="org.wildfly.extension.microprofile.jwt-smallrye"/>
<extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
<extension module="org.wildfly.extension.request-controller"/>
<extension module="org.wildfly.extension.security.manager"/>
<extension module="org.wildfly.extension.undertow"/>
</extensions>
<system-properties>
<property name="webbpm.mode" value="development"/>
<property name="authentication.method" value="form"/>
<property name="jboss.bind.address.management" value="0.0.0.0"/>
<property name="jboss.bind.address" value="0.0.0.0"/>
<property name="ldap.mapping.login.param" value="${env.WEBBPM_LDAP_LOGIN_ATTR:uid}"/>
<property name="ldap.mapping.org.code.param" value="${env.WEBBPM_LDAP_ORGANIZATION_ATTR:ou}"/>
<property name="jboss.as.management.blocking.timeout" value="900"/>
<property name="webbpm.cache.hazelcast.hosts" value="127.0.0.1"/>
<property name="webbpm.cache.hazelcast.outbound_port_definitions" value="5801-5820"/>
<property name="webbpm.security.session.active.count" value="20"/>
<property name="gar.enable" value="false"/>
<property name="security.password.regex" value="^((?=(.*\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$"/>
<property name="fias.enable" value="false"/>
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
<property name="bpmn.enable" value="false"/>
</system-properties>
<management>
<audit-log>
<formatters>
<json-formatter name="json-formatter"/>
</formatters>
<handlers>
<file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
</handlers>
<logger log-boot="true" log-read-only="false" enabled="false">
<handlers>
<handler name="file"/>
</handlers>
</logger>
</audit-log>
<management-interfaces>
<http-interface http-authentication-factory="management-http-authentication">
<http-upgrade enabled="true" sasl-authentication-factory="management-sasl-authentication"/>
<socket-binding http="management-http"/>
</http-interface>
</management-interfaces>
<access-control provider="simple">
<role-mapping>
<role name="SuperUser">
<include>
<user name="$local"/>
</include>
</role>
</role-mapping>
</access-control>
</management>
<profile>
<subsystem xmlns="urn:jboss:domain:logging:8.0">
<console-handler name="CONSOLE">
<level name="INFO"/>
<formatter>
<named-formatter name="COLOR-PATTERN"/>
</formatter>
</console-handler>
<periodic-rotating-file-handler name="FILE" autoflush="true">
<formatter>
<named-formatter name="PATTERN"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
<append value="true"/>
</periodic-rotating-file-handler>
<logger category="com.arjuna">
<level name="WARN"/>
</logger>
<logger category="io.jaegertracing.Configuration">
<level name="WARN"/>
</logger>
<logger category="org.jboss.as.config">
<level name="DEBUG"/>
</logger>
<logger category="sun.rmi">
<level name="WARN"/>
</logger>
<logger category="org.jooq.tools">
<level name="DEBUG"/>
<handlers>
<handler name="CONSOLE"/>
</handlers>
</logger>
<root-logger>
<level name="INFO"/>
<handlers>
<handler name="CONSOLE"/>
<handler name="FILE"/>
</handlers>
</root-logger>
<formatter name="PATTERN">
<pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
<formatter name="COLOR-PATTERN">
<pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
</subsystem>
<subsystem xmlns="urn:jboss:domain:batch-jberet:3.0">
<default-job-repository name="in-memory"/>
<default-thread-pool name="batch"/>
<job-repository name="in-memory">
<in-memory/>
</job-repository>
<thread-pool name="batch">
<max-threads count="10"/>
<keepalive-time time="30" unit="seconds"/>
</thread-pool>
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.0">
<datasources>
<datasource jndi-name="java:jboss/datasources/jbpmDS" pool-name="JBPMDS" enabled="true" statistics-enabled="true">
<connection-url>jdbc:h2:mem:jbpm;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
<security>
<user-name>${env.DB_JBPM_USERNAME:sa}</user-name>
<password>${env.DB_JBPM_PASSWORD:sa}</password>
</security>
<timeout>
<query-timeout>300</query-timeout>
</timeout>
</datasource>
<xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.119</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu-dashboard</xa-datasource-property>
<driver>postgresql-driver</driver>
<security>
<user-name>ervu-dashboard-sec</user-name>
<password>ervu-dashboard-sec</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
<validate-on-match>false</validate-on-match>
<background-validation>true</background-validation>
<background-validation-millis>5000</background-validation-millis>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter" />
</validation>
</xa-datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
</driver>
<driver name="postgresql-driver" module="org.postgresql">
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
</driver>
</drivers>
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
<subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default" default-single-sign-on-management="default">
<infinispan-session-management name="default" cache-container="web" granularity="SESSION">
<local-affinity/>
</infinispan-session-management>
<infinispan-single-sign-on-management name="default" cache-container="web" cache="sso"/>
<local-routing/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee:6.0">
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
<concurrent>
<context-services>
<context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
</context-services>
<managed-thread-factories>
<managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
</managed-thread-factories>
<managed-executor-services>
<managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="5000"/>
</managed-executor-services>
<managed-scheduled-executor-services>
<managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="3000"/>
</managed-scheduled-executor-services>
</concurrent>
</subsystem>
<subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
<subsystem xmlns="urn:jboss:domain:ejb3:9.0">
<session-bean>
<stateless>
<bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
</stateless>
<stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
<singleton default-access-timeout="5000"/>
</session-bean>
<pools>
<bean-instance-pools>
<strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
<strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
</bean-instance-pools>
</pools>
<caches>
<cache name="simple"/>
<cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
</caches>
<passivation-stores>
<passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
</passivation-stores>
<async thread-pool-name="default"/>
<timer-service thread-pool-name="default" default-data-store="default-file-store">
<data-stores>
<file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
</data-stores>
</timer-service>
<remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
<channel-creation-options>
<option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
</channel-creation-options>
</remote>
<thread-pools>
<thread-pool name="default">
<max-threads count="10"/>
<keepalive-time time="60" unit="seconds"/>
</thread-pool>
</thread-pools>
<default-security-domain value="other"/>
<application-security-domains>
<application-security-domain name="other" security-domain="ApplicationDomain"/>
</application-security-domains>
<default-missing-method-permissions-deny-access value="true"/>
<statistics enabled="${wildfly.ejb3.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
<log-system-exceptions value="true"/>
</subsystem>
<subsystem xmlns="urn:wildfly:elytron:15.1" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
<providers>
<aggregate-providers name="combined-providers">
<providers name="elytron"/>
<providers name="openssl"/>
</aggregate-providers>
<provider-loader name="elytron" module="org.wildfly.security.elytron"/>
<provider-loader name="openssl" module="org.wildfly.openssl"/>
</providers>
<audit-logging>
<file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
</audit-logging>
<security-domains>
<security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
<realm name="ManagementRealm" role-decoder="groups-to-roles"/>
<realm name="local" role-mapper="super-user-mapper"/>
</security-domain>
<security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
<realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
<realm name="local"/>
</security-domain>
</security-domains>
<security-realms>
<identity-realm name="local" identity="$local"/>
<properties-realm name="ApplicationRealm">
<users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
<groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
</properties-realm>
<properties-realm name="ManagementRealm">
<users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
<groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
</properties-realm>
</security-realms>
<mappers>
<simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
<permission-mapping>
<principal name="anonymous"/>
<permission-set name="default-permissions"/>
</permission-mapping>
<permission-mapping match-all="true">
<permission-set name="login-permission"/>
<permission-set name="default-permissions"/>
</permission-mapping>
</simple-permission-mapper>
<constant-realm-mapper name="local" realm-name="local"/>
<simple-role-decoder name="groups-to-roles" attribute="groups"/>
<constant-role-mapper name="super-user-mapper">
<role name="SuperUser"/>
</constant-role-mapper>
</mappers>
<permission-sets>
<permission-set name="login-permission">
<permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
</permission-set>
<permission-set name="default-permissions">
<permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
<permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
<permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
</permission-set>
</permission-sets>
<http>
<http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
<mechanism-configuration>
<mechanism mechanism-name="DIGEST">
<mechanism-realm realm-name="ManagementRealm"/>
</mechanism>
</mechanism-configuration>
</http-authentication-factory>
<http-authentication-factory name="application-http-authentication" security-domain="ApplicationDomain" http-server-mechanism-factory="global">
<mechanism-configuration>
<mechanism mechanism-name="BASIC">
<mechanism-realm realm-name="ApplicationRealm"/>
</mechanism>
</mechanism-configuration>
</http-authentication-factory>
<provider-http-server-mechanism-factory name="global"/>
</http>
<sasl>
<sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
<mechanism-configuration>
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
<mechanism mechanism-name="DIGEST-MD5">
<mechanism-realm realm-name="ManagementRealm"/>
</mechanism>
</mechanism-configuration>
</sasl-authentication-factory>
<sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
<mechanism-configuration>
<mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
<mechanism mechanism-name="DIGEST-MD5">
<mechanism-realm realm-name="ApplicationRealm"/>
</mechanism>
</mechanism-configuration>
</sasl-authentication-factory>
<configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
<properties>
<property name="wildfly.sasl.local-user.default-user" value="$local"/>
<property name="wildfly.sasl.local-user.challenge-path" value="${jboss.server.temp.dir}/auth"/>
</properties>
</configurable-sasl-server-factory>
<mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
<filters>
<filter provider-name="WildFlyElytron"/>
</filters>
</mechanism-provider-filtering-sasl-server-factory>
<provider-sasl-server-factory name="global"/>
</sasl>
<tls>
<key-stores>
<key-store name="applicationKS">
<credential-reference clear-text="password"/>
<implementation type="JKS"/>
<file path="application.keystore" relative-to="jboss.server.config.dir"/>
</key-store>
</key-stores>
<key-managers>
<key-manager name="applicationKM" key-store="applicationKS" generate-self-signed-certificate-host="localhost">
<credential-reference clear-text="password"/>
</key-manager>
</key-managers>
<server-ssl-contexts>
<server-ssl-context name="applicationSSC" key-manager="applicationKM"/>
</server-ssl-contexts>
</tls>
</subsystem>
<subsystem xmlns="urn:wildfly:elytron-oidc-client:1.0"/>
<subsystem xmlns="urn:wildfly:health:1.0" security-enabled="false"/>
<subsystem xmlns="urn:jboss:domain:infinispan:13.0">
<cache-container name="ejb" default-cache="passivation" marshaller="PROTOSTREAM" aliases="sfsb" modules="org.wildfly.clustering.ejb.infinispan">
<local-cache name="passivation">
<expiration interval="0"/>
<file-store passivation="true" purge="false"/>
</local-cache>
</cache-container>
<cache-container name="web" default-cache="passivation" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
<local-cache name="passivation">
<expiration interval="0"/>
<file-store passivation="true" purge="false"/>
</local-cache>
<local-cache name="sso">
<expiration interval="0"/>
</local-cache>
</cache-container>
<cache-container name="server" default-cache="default" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.server">
<local-cache name="default">
<expiration interval="0"/>
</local-cache>
</cache-container>
<cache-container name="hibernate" marshaller="JBOSS" modules="org.infinispan.hibernate-cache">
<local-cache name="entity">
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query">
<heap-memory size="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="timestamps">
<expiration interval="0"/>
</local-cache>
<local-cache name="pending-puts">
<expiration max-idle="60000"/>
</local-cache>
</cache-container>
</subsystem>
<subsystem xmlns="urn:jboss:domain:io:3.0">
<worker name="default"/>
<buffer-pool name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:2.0"/>
<subsystem xmlns="urn:jboss:domain:jca:5.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
<default-workmanager>
<short-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
<long-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
<cached-connection-manager/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
<subsystem xmlns="urn:jboss:domain:jmx:1.3">
<expose-resolved-model/>
<expose-expression-model/>
<remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jpa:1.1">
<jpa default-extended-persistence-inheritance="DEEP"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
<subsystem xmlns="urn:jboss:domain:mail:4.0">
<mail-session name="default" jndi-name="java:jboss/mail/Default">
<smtp-server outbound-socket-binding-ref="mail-smtp"/>
</mail-session>
</subsystem>
<subsystem xmlns="urn:wildfly:metrics:1.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:wildfly}"/>
<subsystem xmlns="urn:wildfly:microprofile-config-smallrye:2.0"/>
<subsystem xmlns="urn:wildfly:microprofile-jwt-smallrye:1.0"/>
<subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:3.0" default-tracer="jaeger">
<jaeger-tracer name="jaeger">
<sampler-configuration sampler-type="const" sampler-param="1.0"/>
</jaeger-tracer>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
<subsystem xmlns="urn:jboss:domain:remoting:4.0">
<http-connector name="http-remoting-connector" connector-ref="default" sasl-authentication-factory="application-sasl-authentication"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
<subsystem xmlns="urn:jboss:domain:resource-adapters:6.1"/>
<subsystem xmlns="urn:jboss:domain:sar:1.0"/>
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
<deployment-permissions>
<maximum-set>
<permission class="java.security.AllPermission"/>
</maximum-set>
</deployment-permissions>
</subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:6.0">
<core-environment node-identifier="${jboss.tx.node.id:1}">
<process-id>
<uuid/>
</process-id>
</core-environment>
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
<coordinator-environment statistics-enabled="${wildfly.transactions.statistics-enabled:${wildfly.statistics-enabled:false}}"/>
<object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:undertow:12.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
<buffer-cache name="default"/>
<server name="default-server">
<http-listener name="default" socket-binding="http" max-post-size="${env.MAX_POST_SIZE:104857600}" record-request-start-time="true" redirect-socket="https" enable-http2="true"/>
<https-listener name="https" socket-binding="https" ssl-context="applicationSSC" enable-http2="true"/>
<host name="default-host" alias="localhost">
<location name="/" handler="welcome-content"/>
<filter-ref name="cache-control" predicate="path-suffix['.bpmn'] or path-suffix['.bpmn2']"/>
<http-invoker http-authentication-factory="application-http-authentication"/>
</host>
</server>
<servlet-container name="default">
<jsp-config/>
<websockets/>
</servlet-container>
<handlers>
<file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
</handlers>
<filters>
<response-header name="cache-control" header-name="Cache-Control" header-value="no-store"/>
</filters>
<application-security-domains>
<application-security-domain name="other" security-domain="ApplicationDomain"/>
</application-security-domains>
</subsystem>
<subsystem xmlns="urn:jboss:domain:webservices:2.0" statistics-enabled="${wildfly.webservices.statistics-enabled:${wildfly.statistics-enabled:false}}">
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
<endpoint-config name="Standard-Endpoint-Config"/>
<endpoint-config name="Recording-Endpoint-Config">
<pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
<handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
</pre-handler-chain>
</endpoint-config>
<client-config name="Standard-Client-Config"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:weld:4.0"/>
</profile>
<interfaces>
<interface name="management">
<inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
</interface>
<interface name="public">
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
</interface>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
<socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
<socket-binding name="http" port="${jboss.http.port:8080}"/>
<socket-binding name="https" port="${jboss.https.port:8443}"/>
<socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
<socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
<socket-binding name="txn-status-manager" port="4713"/>
<outbound-socket-binding name="mail-smtp">
<remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
</outbound-socket-binding>
</socket-binding-group>
</server>

View file

@ -1,37 +0,0 @@
# Security datasource
DB_SEC_USERNAME=ervu-dashboard-sec
DB_SEC_PASSWORD=ervu-dashboard-sec
DB_SEC_HOST=10.10.31.119
DB_SEC_PORT=5432
DB_SEC_NAME=ervu-dashboard
# App datasource
DB_APP_USERNAME=ervu-dashboard
DB_APP_PASSWORD=ervu-dashboard
DB_APP_HOST=10.10.31.119
DB_APP_PORT=5432
DB_APP_NAME=ervu-dashboard
# jBPM datasorce
DB_JBPM_USERNAME=jbpm-ervu-dashboard
DB_JBPM_PASSWORD=jbpm-ervu-dashboard
DB_JBPM_HOST=10.10.31.119
DB_JBPM_PORT=5432
DB_JBPM_NAME=jbpm-ervu-dashboard
# Elasticsearch
WEBBPM_ELASTIC_HOST=
WEBBPM_ELASTIC_USER_PASSWORD=
# LDAP
WEBBPM_LDAP_URL=
WEBBPM_LDAP_BASE=
WEBBPM_LDAP_USER=
WEBBPM_LDAP_PASSWORD=
WEBBPM_LDAP_SYNC_ENABLED=false
WEBBPM_LDAP_SYNC_CRON=0 0 * * * *
WEBBPM_LDAP_LOGIN_ATTR=uid
WEBBPM_LDAP_ORGANIZATION_ATTR=ou
# JIRA
WEBBPM_JIRA_URL=https:/jira.com
WEBBPM_JIRA_USER=jiraUser
WEBBPM_JIRA_PASSWORD=jiraPass
TZ=Europe/Moscow
WEBBPM_TELEGRAM_BOT_TOKEN=
WEBBPM_TELEGRAM_BOT_NAME=

View file

@ -1,13 +1,5 @@
#!/usr/bin/env bash
#export JAVA_OPTS="$JAVA_OPTS \
# -Ddb.app.host=${DB_APP_HOST:-10.10.31.119} \
# -Ddb.app.port=${DB_APP_PORT:-5432} \
# -Ddb.app.name=${DB_APP_NAME:-ervu-dashboard} \
# -Ddb.app.username=${DB_APP_USERNAME:-ervu-dashboard} \
# -Ddb.app.password=${DB_APP_PASSWORD:-ervu-dashboard} \
#"
export JAVA_OPTS="$JAVA_OPTS \
-Ddb.app.host=${DB_APP_HOST:-db} \
-Ddb.app.port=${DB_APP_PORT:-5432} \

View file

@ -527,7 +527,6 @@
<componentRootId>4779d777-9c26-49bd-8acf-861160343c27</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>

View file

@ -532,6 +532,7 @@
<componentRootId>6710c493-e4f6-4a38-b56a-3dcf5cf7269b</componentRootId>
<name>Всего состоят на учете</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -639,7 +640,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -904,6 +905,7 @@
<componentRootId>35edb048-fd74-4ecb-a101-d3b7cf933b64</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2884,6 +2886,7 @@
<componentRootId>bc72b920-b037-453b-b7d6-2aae8a5ab38d</componentRootId>
<name>VB - Подлежат постановке на учет</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2991,7 +2994,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -5588,7 +5591,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -7548,7 +7551,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -9551,7 +9554,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>

View file

@ -238,7 +238,6 @@
<componentRootId>a4212869-ad38-415f-8c7f-79c1c0bd0b3c</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -634,6 +633,7 @@
<componentRootId>3cd1c88a-a967-4ede-8090-685369098604</componentRootId>
<name>Всего состоят на учете</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -736,7 +736,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -2890,6 +2890,7 @@
<componentRootId>ec7e0341-cba8-4c6a-a472-6ff1dd337054</componentRootId>
<name>Возраст и Дети до 18лет</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -2901,7 +2902,6 @@
<componentRootId>af7000dd-283a-45b6-acbf-6e1de7f22f88</componentRootId>
<name>Возраст</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3133,7 +3133,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -3877,7 +3877,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -4654,7 +4654,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -5325,7 +5325,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["true"]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["true"]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"age":{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["true"]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"age","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"total_registered","table":"age","entity":"age","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["\"true\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["\"true\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":111.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"age":{"tableName":"age","schemaName":"total_registered","x":272.0,"y":225.0,"alias":"age","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"age","entity":"age","name":"all_M_W"},"operation":"EQUAL","typeCode":"CONST","values":["\"M\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"registered"},"operation":"EQUAL","typeCode":"CONST","values":["\"true\""]},{"column":{"schema":"total_registered","table":"age","entity":"age","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"age","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"total_registered","table":"age","entity":"age","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -5398,7 +5398,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -6175,7 +6175,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -6919,7 +6919,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -12510,6 +12510,7 @@
<componentRootId>c8256eda-0d42-4abb-89e4-d582b973df82</componentRootId>
<name>VB - Семейное положение и Занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -12616,6 +12617,7 @@
<componentRootId>fb12503f-5751-4ed5-9b80-2bc8d3b753f1</componentRootId>
<name>Все</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -12946,7 +12948,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -13612,6 +13614,7 @@
<componentRootId>32c2c464-1e99-4896-a86a-9450f6cbe777</componentRootId>
<name>Мужчины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -13954,7 +13957,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -14619,6 +14622,7 @@
<componentRootId>c252bb67-e71f-4b2a-a27f-bafbf016a779</componentRootId>
<name>Женщины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -14948,7 +14952,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -15615,6 +15619,7 @@
<componentRootId>0caafab8-de1c-42b0-b845-fca7e0e97ec3</componentRootId>
<name>VB - Занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -15709,6 +15714,7 @@
<componentRootId>ee393763-da90-47bb-8cba-4f2b048b2147</componentRootId>
<name>Все</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -16049,7 +16055,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -16567,6 +16573,7 @@
<componentRootId>9c4aeda5-544a-41f8-a974-1ea26d844a3c</componentRootId>
<name>Мужчины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -16923,7 +16930,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -17438,6 +17445,7 @@
<componentRootId>34699c40-e758-4fd1-995f-3dc5005932e8</componentRootId>
<name>Женщины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -17790,7 +17798,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -18308,6 +18316,7 @@
<componentRootId>5e96662f-a6b4-4881-b780-1fa35e3acba7</componentRootId>
<name>VB - Наличие водительского удостоверения и Уровень образования</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -18319,6 +18328,7 @@
<componentRootId>28f4be3e-5a7f-4c9c-b414-5ed0d0107739</componentRootId>
<name>Наличие водительского удостоверения</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -18413,6 +18423,7 @@
<componentRootId>452b0e81-cbc0-4b02-a98d-7d3259e83546</componentRootId>
<name>Все</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -18550,7 +18561,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -19536,7 +19547,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -20397,6 +20408,7 @@
<componentRootId>2d535e6f-0f0b-4b6c-831b-da023a4caec8</componentRootId>
<name>Мужчины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -20534,7 +20546,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -21520,7 +21532,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -22396,6 +22408,7 @@
<componentRootId>df513375-6306-45c2-aee5-6f596cfc8757</componentRootId>
<name>Женщины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -22533,7 +22546,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -24397,6 +24410,7 @@
<componentRootId>4e8c5b1c-4f39-476f-8bf9-e59b45bf29cb</componentRootId>
<name>VB - Уровень образования</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -24613,7 +24627,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -24670,6 +24684,7 @@
<componentRootId>01bd401c-daef-4c4a-a593-f886a1266318</componentRootId>
<name>VB - график</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -24874,6 +24889,7 @@
<componentRootId>1232e4b1-d9d3-4e33-b796-f2939ef2ea78</componentRootId>
<name>HB - высшее/среднее/общее/нет данных</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -26088,7 +26104,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -27594,7 +27610,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>

View file

@ -26,7 +26,6 @@
<componentRootId>2a5b0bb1-72ef-4473-9006-0cde6cb5dc62</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -459,7 +458,7 @@
<entry>
<key>isBusinessId</key>
<value>
<simple>false</simple>
<simple>true</simple>
</value>
</entry>
<entry>
@ -659,7 +658,6 @@
<componentRootId>e444930c-1ea3-449a-9ed6-7e4f31b0a4c3</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -684,6 +682,7 @@
<componentRootId>62ad92df-92a4-456b-9c72-c4e133f621f9</componentRootId>
<name>VB - Подлежат постановке на учет</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -788,7 +787,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -3020,6 +3019,7 @@
<componentRootId>76298b31-e12e-4ce4-b510-3e2378cb672c</componentRootId>
<name>VB - Возраст и занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -3031,6 +3031,7 @@
<componentRootId>90815563-92e7-462e-9799-94bc6347c6b1</componentRootId>
<name>Возраст</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3262,7 +3263,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -4006,7 +4007,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -4783,7 +4784,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -5527,7 +5528,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -6304,7 +6305,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -7048,7 +7049,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -7690,6 +7691,7 @@
<componentRootId>e304e85c-a38b-48f9-82b6-2b3fc14a912c</componentRootId>
<name>VB - Занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -7784,6 +7786,7 @@
<componentRootId>f43590a6-8f2e-4f76-8c49-63ccfb06e138</componentRootId>
<name>Все</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -8131,7 +8134,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -8675,6 +8678,7 @@
<componentRootId>8088f814-aaf2-4655-9075-a46f93299e45</componentRootId>
<name>Мужчины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -8913,6 +8917,7 @@
<componentRootId>48b6c408-831b-4361-8bc7-21568dd1fb37</componentRootId>
<name>VB - в учатся/работают/безработ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -9028,7 +9033,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -9569,6 +9574,7 @@
<componentRootId>87ad13ad-a19e-47e9-bb2b-d5a8e455422f</componentRootId>
<name>Женщины</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -9930,7 +9936,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -10474,6 +10480,7 @@
<componentRootId>c82f22ad-6e64-4e09-9a35-982e97a0302c</componentRootId>
<name>VB - Категории постановки на ВУ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -10576,7 +10583,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -10716,7 +10723,6 @@
<componentRootId>3fec20ea-9d76-4166-af15-048e370dd6da</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -12799,7 +12805,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -12826,7 +12832,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":245.0,"y":220.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":245.0,"y":220.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":245.0,"y":220.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13108,7 +13114,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":354.4,"y":305.8,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":354.4,"y":305.8,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":354.4,"y":305.8,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13227,7 +13233,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":331.19999999999993,"y":260.20000000000005,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":331.19999999999993,"y":260.20000000000005,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":331.19999999999993,"y":260.20000000000005,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13346,7 +13352,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":381.6,"y":295.40000000000003,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":381.6,"y":295.40000000000003,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":381.6,"y":295.40000000000003,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>

View file

@ -26,6 +26,7 @@
<componentRootId>715b4fb9-722e-4812-ac26-d239177deb69</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -449,7 +450,7 @@
<entry>
<key>isBusinessId</key>
<value>
<simple>false</simple>
<simple>true</simple>
</value>
</entry>
<entry>
@ -814,6 +815,7 @@
<componentRootId>ad49eb04-6457-4a7e-8971-8228d8003f5f</componentRootId>
<name>Осень</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -923,7 +925,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -1974,7 +1976,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -2916,6 +2918,7 @@
<componentRootId>0a07229f-1c03-4f45-8651-c70f6b68df74</componentRootId>
<name>VB - Повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3106,7 +3109,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -5945,7 +5948,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -8833,6 +8836,7 @@
<componentRootId>6da4fd55-7c44-452f-bb1b-c7bc75ab21fd</componentRootId>
<name>VB - Обжалования</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -9025,7 +9029,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -10206,6 +10210,7 @@
<componentRootId>caeade8d-6f91-4e34-bcfa-a0b90f80b227</componentRootId>
<name>Весна</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -10325,7 +10330,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -10352,7 +10357,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>

View file

@ -26,7 +26,6 @@
<componentRootId>15953803-1cbe-4cbf-92bd-5359c4d0ff09</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -450,7 +449,7 @@
<entry>
<key>isBusinessId</key>
<value>
<simple>false</simple>
<simple>true</simple>
</value>
</entry>
<entry>
@ -643,7 +642,6 @@
<componentRootId>bdcbe967-161a-4f64-b4e7-796a210c6704</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -668,6 +666,7 @@
<componentRootId>1c6c88af-a164-4e0d-9cbb-a6bc59d30414</componentRootId>
<name>Всего состоят на учете</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -770,7 +769,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -3155,7 +3154,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -5369,7 +5368,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -7609,7 +7608,6 @@
<componentRootId>a00e8828-e03e-434a-98f8-7dfd6575a687</componentRootId>
<name>VB - Повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -7717,7 +7715,7 @@
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
<simple>"getBusinessId"</simple>
</value>
</entry>
</complex>
@ -7744,7 +7742,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":390.0,"y":269.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":390.0,"y":269.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":390.0,"y":269.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>