From 31faad33b2463353d9f58314a22a33b9612976cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=BE=D0=B0=D1=82=20=D0=A1=D0=B0=D0=BB=D1=8F=D1=85?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 13 Nov 2025 17:37:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db_beans/appeals/Appeals.java | 8 +- .../ervu_dashboard/db_beans/appeals/Keys.java | 6 +- .../db_beans/appeals/Tables.java | 6 +- .../appeals/tables/ReasonsAppeal.java | 324 --- .../appeals/tables/ReviewProgress.java | 277 ++ .../db_beans/appeals/tables/TopicAppeal.java | 40 +- .../tables/records/ReasonsAppealRecord.java | 342 --- .../tables/records/ReviewProgressRecord.java | 218 ++ .../tables/records/TopicAppealRecord.java | 149 +- .../ervu_dashboard/ErvuDashboard.java | 7 + .../db_beans/ervu_dashboard/Keys.java | 3 + .../db_beans/ervu_dashboard/Tables.java | 6 + .../ervu_dashboard/tables/Citizen.java | 2 +- .../ervu_dashboard/tables/ReasonDict.java | 229 ++ .../tables/records/CitizenRecord.java | 8 +- .../tables/records/ReasonDictRecord.java | 96 + .../tables/ConsiderationComplaint.java | 6 + .../records/ConsiderationComplaintRecord.java | 19 +- .../resources/business-model/appeals.page | 1302 +++++---- .../main/resources/business-model/main.page | 673 ++++- .../resources/business-model/ratings.page | 12 +- .../resources/business-model/recruitment.page | 2585 +++++++++++++++-- 22 files changed, 4699 insertions(+), 1619 deletions(-) delete mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReasonsAppeal.java create mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReviewProgress.java delete mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReasonsAppealRecord.java create mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReviewProgressRecord.java create mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java create mode 100644 backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Appeals.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Appeals.java index 4c249c5b..3356c47e 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Appeals.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Appeals.java @@ -14,7 +14,7 @@ import org.jooq.impl.SchemaImpl; import ru.micord.ervu_dashboard.db_beans.DefaultCatalog; import ru.micord.ervu_dashboard.db_beans.appeals.tables.AppealsList; import ru.micord.ervu_dashboard.db_beans.appeals.tables.MainProfile; -import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReasonsAppeal; +import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewProgress; import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewRating; import ru.micord.ervu_dashboard.db_beans.appeals.tables.TopicAppeal; @@ -43,9 +43,9 @@ public class Appeals extends SchemaImpl { public final MainProfile MAIN_PROFILE = MainProfile.MAIN_PROFILE; /** - * Причины обжалования уровень РФ + * Ход рассмотрения */ - public final ReasonsAppeal REASONS_APPEAL = ReasonsAppeal.REASONS_APPEAL; + public final ReviewProgress REVIEW_PROGRESS = ReviewProgress.REVIEW_PROGRESS; /** * Рейтинг рассмотрения жалоб уровень РФ @@ -75,7 +75,7 @@ public class Appeals extends SchemaImpl { return Arrays.asList( AppealsList.APPEALS_LIST, MainProfile.MAIN_PROFILE, - ReasonsAppeal.REASONS_APPEAL, + ReviewProgress.REVIEW_PROGRESS, ReviewRating.REVIEW_RATING, TopicAppeal.TOPIC_APPEAL ); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Keys.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Keys.java index 28b6bc55..8e19fb34 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Keys.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Keys.java @@ -11,12 +11,12 @@ import org.jooq.impl.Internal; import ru.micord.ervu_dashboard.db_beans.appeals.tables.AppealsList; import ru.micord.ervu_dashboard.db_beans.appeals.tables.MainProfile; -import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReasonsAppeal; +import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewProgress; import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewRating; import ru.micord.ervu_dashboard.db_beans.appeals.tables.TopicAppeal; import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.AppealsListRecord; import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.MainProfileRecord; -import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.ReasonsAppealRecord; +import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.ReviewProgressRecord; import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.ReviewRatingRecord; import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.TopicAppealRecord; @@ -34,7 +34,7 @@ public class Keys { public static final UniqueKey PK_APPEALS_LIST = Internal.createUniqueKey(AppealsList.APPEALS_LIST, DSL.name("pk_appeals_list"), new TableField[] { AppealsList.APPEALS_LIST.NUMBER }, true); public static final UniqueKey PK_MAIN_PROFILE = Internal.createUniqueKey(MainProfile.MAIN_PROFILE, DSL.name("pk_main_profile"), new TableField[] { MainProfile.MAIN_PROFILE.RECRUITMENT_ID, MainProfile.MAIN_PROFILE.RECORDING_DATE, MainProfile.MAIN_PROFILE.SCHEMA }, true); - public static final UniqueKey PK_REASONS_APPEAL = Internal.createUniqueKey(ReasonsAppeal.REASONS_APPEAL, DSL.name("pk_reasons_appeal"), new TableField[] { ReasonsAppeal.REASONS_APPEAL.RECRUITMENT_ID, ReasonsAppeal.REASONS_APPEAL.RECORDING_DATE, ReasonsAppeal.REASONS_APPEAL.SCHEMA }, true); + public static final UniqueKey REVIEW_PROGRESS_PKEY = Internal.createUniqueKey(ReviewProgress.REVIEW_PROGRESS, DSL.name("review_progress_pkey"), new TableField[] { ReviewProgress.REVIEW_PROGRESS.ID_REVIEW_PROGRESS, ReviewProgress.REVIEW_PROGRESS.RECRUITMENT_ID, ReviewProgress.REVIEW_PROGRESS.SCHEMA, ReviewProgress.REVIEW_PROGRESS.RECORDING_DATE }, true); public static final UniqueKey PK_REVIEW_RATING = Internal.createUniqueKey(ReviewRating.REVIEW_RATING, DSL.name("pk_review_rating"), new TableField[] { ReviewRating.REVIEW_RATING.ID_REVIEW_RATING }, true); public static final UniqueKey PK_TOPIC_APPEAL = Internal.createUniqueKey(TopicAppeal.TOPIC_APPEAL, DSL.name("pk_topic_appeal"), new TableField[] { TopicAppeal.TOPIC_APPEAL.RECRUITMENT_ID, TopicAppeal.TOPIC_APPEAL.RECORDING_DATE, TopicAppeal.TOPIC_APPEAL.SCHEMA }, true); } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Tables.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Tables.java index fafdf59e..7cadac55 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Tables.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Tables.java @@ -6,7 +6,7 @@ package ru.micord.ervu_dashboard.db_beans.appeals; import ru.micord.ervu_dashboard.db_beans.appeals.tables.AppealsList; import ru.micord.ervu_dashboard.db_beans.appeals.tables.MainProfile; -import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReasonsAppeal; +import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewProgress; import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewRating; import ru.micord.ervu_dashboard.db_beans.appeals.tables.TopicAppeal; @@ -28,9 +28,9 @@ public class Tables { public static final MainProfile MAIN_PROFILE = MainProfile.MAIN_PROFILE; /** - * Причины обжалования уровень РФ + * Ход рассмотрения */ - public static final ReasonsAppeal REASONS_APPEAL = ReasonsAppeal.REASONS_APPEAL; + public static final ReviewProgress REVIEW_PROGRESS = ReviewProgress.REVIEW_PROGRESS; /** * Рейтинг рассмотрения жалоб уровень РФ diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReasonsAppeal.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReasonsAppeal.java deleted file mode 100644 index b1fc8ff7..00000000 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReasonsAppeal.java +++ /dev/null @@ -1,324 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package ru.micord.ervu_dashboard.db_beans.appeals.tables; - - -import java.math.BigDecimal; -import java.sql.Date; -import java.util.Collection; -import java.util.UUID; - -import org.jooq.Condition; -import org.jooq.Field; -import org.jooq.Identity; -import org.jooq.Name; -import org.jooq.PlainSQL; -import org.jooq.QueryPart; -import org.jooq.SQL; -import org.jooq.Schema; -import org.jooq.Select; -import org.jooq.Stringly; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; - -import ru.micord.ervu_dashboard.db_beans.appeals.Appeals; -import ru.micord.ervu_dashboard.db_beans.appeals.Keys; -import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.ReasonsAppealRecord; - - -/** - * Причины обжалования уровень РФ - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ReasonsAppeal extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of appeals.reasons_appeal - */ - public static final ReasonsAppeal REASONS_APPEAL = new ReasonsAppeal(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return ReasonsAppealRecord.class; - } - - /** - * The column appeals.reasons_appeal.id_reasons_appeal. - */ - public final TableField ID_REASONS_APPEAL = createField(DSL.name("id_reasons_appeal"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); - - /** - * The column appeals.reasons_appeal.appeal. Обжалования - */ - public final TableField APPEAL = createField(DSL.name("appeal"), SQLDataType.NUMERIC, this, "Обжалования"); - - /** - * The column appeals.reasons_appeal.incorrect_inf. - * Некорректные сведения - */ - public final TableField INCORRECT_INF = createField(DSL.name("incorrect_inf"), SQLDataType.NUMERIC, this, "Некорректные сведения"); - - /** - * The column appeals.reasons_appeal.no_data. Нет данных - */ - public final TableField NO_DATA = createField(DSL.name("no_data"), SQLDataType.NUMERIC, this, "Нет данных"); - - /** - * The column appeals.reasons_appeal.other. Прочее - */ - public final TableField OTHER = createField(DSL.name("other"), SQLDataType.NUMERIC, this, "Прочее"); - - /** - * The column appeals.reasons_appeal.recording_date. Дата - * записи - */ - public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи"); - - /** - * The column appeals.reasons_appeal.incorrect_inf_percent. - * Некорректные сведения в процентах - */ - public final TableField INCORRECT_INF_PERCENT = createField(DSL.name("incorrect_inf_percent"), SQLDataType.NUMERIC, this, "Некорректные сведения в процентах"); - - /** - * The column appeals.reasons_appeal.no_data_percent. Нет - * данных в процентах - */ - public final TableField NO_DATA_PERCENT = createField(DSL.name("no_data_percent"), SQLDataType.NUMERIC, this, "Нет данных в процентах"); - - /** - * The column appeals.reasons_appeal.other_percent. Прочее в - * процентах - */ - public final TableField OTHER_PERCENT = createField(DSL.name("other_percent"), SQLDataType.NUMERIC, this, "Прочее в процентах"); - - /** - * The column appeals.reasons_appeal.recruitment_id. - */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID.nullable(false), this, ""); - - /** - * The column appeals.reasons_appeal.sending_documents. Досыл - * документов - */ - public final TableField SENDING_DOCUMENTS = createField(DSL.name("sending_documents"), SQLDataType.NUMERIC, this, "Досыл документов"); - - /** - * The column appeals.reasons_appeal.sending_documents_percent. - * Досыл документов (проценты) - */ - public final TableField SENDING_DOCUMENTS_PERCENT = createField(DSL.name("sending_documents_percent"), SQLDataType.NUMERIC, this, "Досыл документов (проценты)"); - - /** - * The column appeals.reasons_appeal.complaint_withdrawal. - * Отзыв жалобы - */ - public final TableField COMPLAINT_WITHDRAWAL = createField(DSL.name("complaint_withdrawal"), SQLDataType.NUMERIC, this, "Отзыв жалобы"); - - /** - * The column - * appeals.reasons_appeal.complaint_withdrawal_percent. Отзыв - * жалобы (проценты) - */ - public final TableField COMPLAINT_WITHDRAWAL_PERCENT = createField(DSL.name("complaint_withdrawal_percent"), SQLDataType.NUMERIC, this, "Отзыв жалобы (проценты)"); - - /** - * The column appeals.reasons_appeal.decision_disagreement. - * Несогласие с решением - */ - public final TableField DECISION_DISAGREEMENT = createField(DSL.name("decision_disagreement"), SQLDataType.NUMERIC, this, "Несогласие с решением"); - - /** - * The column - * appeals.reasons_appeal.decision_disagreement_persent. - * Несогласие с решением (проценты) - */ - public final TableField DECISION_DISAGREEMENT_PERSENT = createField(DSL.name("decision_disagreement_persent"), SQLDataType.NUMERIC, this, "Несогласие с решением (проценты)"); - - /** - * The column appeals.reasons_appeal.schema. 'Department' - - * обычный ВК, 'Organization' - главный ВК региона, 'Region' - главный ВК - * военного округа, - * 'Ministry' - уровень РФ, 'REG_LVL' - сумма всех ВК региона, - * 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ - */ - public final TableField SCHEMA = createField(DSL.name("schema"), SQLDataType.VARCHAR(64).nullable(false).defaultValue(DSL.field(DSL.raw("'empty'::character varying"), SQLDataType.VARCHAR)), this, "'Department' - обычный ВК, 'Organization' - главный ВК региона, 'Region' - главный ВК военного округа,\n 'Ministry' - уровень РФ, 'REG_LVL' - сумма всех ВК региона, 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ"); - - private ReasonsAppeal(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private ReasonsAppeal(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment("Причины обжалования уровень РФ"), TableOptions.table(), where); - } - - /** - * Create an aliased appeals.reasons_appeal table reference - */ - public ReasonsAppeal(String alias) { - this(DSL.name(alias), REASONS_APPEAL); - } - - /** - * Create an aliased appeals.reasons_appeal table reference - */ - public ReasonsAppeal(Name alias) { - this(alias, REASONS_APPEAL); - } - - /** - * Create a appeals.reasons_appeal table reference - */ - public ReasonsAppeal() { - this(DSL.name("reasons_appeal"), null); - } - - @Override - public Schema getSchema() { - return aliased() ? null : Appeals.APPEALS; - } - - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.PK_REASONS_APPEAL; - } - - @Override - public ReasonsAppeal as(String alias) { - return new ReasonsAppeal(DSL.name(alias), this); - } - - @Override - public ReasonsAppeal as(Name alias) { - return new ReasonsAppeal(alias, this); - } - - @Override - public ReasonsAppeal as(Table alias) { - return new ReasonsAppeal(alias.getQualifiedName(), this); - } - - /** - * Rename this table - */ - @Override - public ReasonsAppeal rename(String name) { - return new ReasonsAppeal(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public ReasonsAppeal rename(Name name) { - return new ReasonsAppeal(name, null); - } - - /** - * Rename this table - */ - @Override - public ReasonsAppeal rename(Table name) { - return new ReasonsAppeal(name.getQualifiedName(), null); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal where(Condition condition) { - return new ReasonsAppeal(getQualifiedName(), aliased() ? this : null, null, condition); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal where(Collection conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal where(Condition... conditions) { - return where(DSL.and(conditions)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal where(Field condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public ReasonsAppeal where(SQL condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public ReasonsAppeal where(@Stringly.SQL String condition) { - return where(DSL.condition(condition)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public ReasonsAppeal where(@Stringly.SQL String condition, Object... binds) { - return where(DSL.condition(condition, binds)); - } - - /** - * Create an inline derived table from this table - */ - @Override - @PlainSQL - public ReasonsAppeal where(@Stringly.SQL String condition, QueryPart... parts) { - return where(DSL.condition(condition, parts)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal whereExists(Select select) { - return where(DSL.exists(select)); - } - - /** - * Create an inline derived table from this table - */ - @Override - public ReasonsAppeal whereNotExists(Select select) { - return where(DSL.notExists(select)); - } -} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReviewProgress.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReviewProgress.java new file mode 100644 index 00000000..c196126d --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReviewProgress.java @@ -0,0 +1,277 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.appeals.tables; + + +import java.math.BigDecimal; +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + +import ru.micord.ervu_dashboard.db_beans.appeals.Appeals; +import ru.micord.ervu_dashboard.db_beans.appeals.Keys; +import ru.micord.ervu_dashboard.db_beans.appeals.tables.records.ReviewProgressRecord; + + +/** + * Ход рассмотрения + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReviewProgress extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of appeals.review_progress + */ + public static final ReviewProgress REVIEW_PROGRESS = new ReviewProgress(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ReviewProgressRecord.class; + } + + /** + * The column appeals.review_progress.id_review_progress. + */ + public final TableField ID_REVIEW_PROGRESS = createField(DSL.name("id_review_progress"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column appeals.review_progress.recruitment_id. + */ + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID.nullable(false), this, ""); + + /** + * The column appeals.review_progress.schema. + */ + public final TableField SCHEMA = createField(DSL.name("schema"), SQLDataType.VARCHAR(64).nullable(false).defaultValue(DSL.field(DSL.raw("'empty'::character varying"), SQLDataType.VARCHAR)), this, ""); + + /** + * The column appeals.review_progress.recording_date. + */ + public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, ""); + + /** + * The column appeals.review_progress.in_work. в работе + */ + public final TableField IN_WORK = createField(DSL.name("in_work"), SQLDataType.NUMERIC, this, "в работе"); + + /** + * The column appeals.review_progress.decided. решено + */ + public final TableField DECIDED = createField(DSL.name("decided"), SQLDataType.NUMERIC, this, "решено"); + + /** + * The column appeals.review_progress.revoked. отозвано + */ + public final TableField REVOKED = createField(DSL.name("revoked"), SQLDataType.NUMERIC, this, "отозвано"); + + /** + * The column appeals.review_progress.in_work_percent. + */ + public final TableField IN_WORK_PERCENT = createField(DSL.name("in_work_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column appeals.review_progress.decided_percent. + */ + public final TableField DECIDED_PERCENT = createField(DSL.name("decided_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column appeals.review_progress.revoked_percent. + */ + public final TableField REVOKED_PERCENT = createField(DSL.name("revoked_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column appeals.review_progress.total_appeals. + */ + public final TableField TOTAL_APPEALS = createField(DSL.name("total_appeals"), SQLDataType.NUMERIC, this, ""); + + private ReviewProgress(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private ReviewProgress(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("Ход рассмотрения"), TableOptions.table(), where); + } + + /** + * Create an aliased appeals.review_progress table reference + */ + public ReviewProgress(String alias) { + this(DSL.name(alias), REVIEW_PROGRESS); + } + + /** + * Create an aliased appeals.review_progress table reference + */ + public ReviewProgress(Name alias) { + this(alias, REVIEW_PROGRESS); + } + + /** + * Create a appeals.review_progress table reference + */ + public ReviewProgress() { + this(DSL.name("review_progress"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Appeals.APPEALS; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.REVIEW_PROGRESS_PKEY; + } + + @Override + public ReviewProgress as(String alias) { + return new ReviewProgress(DSL.name(alias), this); + } + + @Override + public ReviewProgress as(Name alias) { + return new ReviewProgress(alias, this); + } + + @Override + public ReviewProgress as(Table alias) { + return new ReviewProgress(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public ReviewProgress rename(String name) { + return new ReviewProgress(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public ReviewProgress rename(Name name) { + return new ReviewProgress(name, null); + } + + /** + * Rename this table + */ + @Override + public ReviewProgress rename(Table name) { + return new ReviewProgress(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress where(Condition condition) { + return new ReviewProgress(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReviewProgress where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReviewProgress where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReviewProgress where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReviewProgress where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReviewProgress whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/TopicAppeal.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/TopicAppeal.java index 03a20c58..6bc838bc 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/TopicAppeal.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/TopicAppeal.java @@ -64,18 +64,6 @@ public class TopicAppeal extends TableImpl { */ public final TableField REGISTRATION = createField(DSL.name("registration"), SQLDataType.NUMERIC, this, "Тема обжалования постановка на учет"); - /** - * The column appeals.topic_appeal.sabpoena. Тема обжалования - * повестки - */ - public final TableField SABPOENA = createField(DSL.name("sabpoena"), SQLDataType.NUMERIC, this, "Тема обжалования повестки"); - - /** - * The column appeals.topic_appeal.appear. Тема обжалования - * явка - */ - public final TableField APPEAR = createField(DSL.name("appear"), SQLDataType.NUMERIC, this, "Тема обжалования явка"); - /** * The column appeals.topic_appeal.temporary_measures. Тема * обжалования временные меры @@ -125,6 +113,34 @@ public class TopicAppeal extends TableImpl { */ public final TableField SCHEMA = createField(DSL.name("schema"), SQLDataType.VARCHAR(64).nullable(false).defaultValue(DSL.field(DSL.raw("'empty'::character varying"), SQLDataType.VARCHAR)), this, "'Department' - обычный ВК, 'Organization' - главный ВК региона, 'Region' - главный ВК военного округа,\n 'Ministry' - уровень РФ, 'REG_LVL' - сумма всех ВК региона, 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ"); + /** + * The column appeals.topic_appeal.recruitment_campaign. + * Решения призывной комиссии + */ + public final TableField RECRUITMENT_CAMPAIGN = createField(DSL.name("recruitment_campaign"), SQLDataType.NUMERIC, this, "Решения призывной комиссии"); + + /** + * The column + * appeals.topic_appeal.recruitment_campaign_percent. + */ + public final TableField RECRUITMENT_CAMPAIGN_PERCENT = createField(DSL.name("recruitment_campaign_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column appeals.topic_appeal.making_changes. Внесение + * изменений + */ + public final TableField MAKING_CHANGES = createField(DSL.name("making_changes"), SQLDataType.NUMERIC, this, "Внесение изменений"); + + /** + * The column appeals.topic_appeal.making_changes_percent. + */ + public final TableField MAKING_CHANGES_PERCENT = createField(DSL.name("making_changes_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column appeals.topic_appeal.total_appeals. + */ + public final TableField TOTAL_APPEALS = createField(DSL.name("total_appeals"), SQLDataType.NUMERIC, this, ""); + private TopicAppeal(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReasonsAppealRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReasonsAppealRecord.java deleted file mode 100644 index db8a87db..00000000 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReasonsAppealRecord.java +++ /dev/null @@ -1,342 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package ru.micord.ervu_dashboard.db_beans.appeals.tables.records; - - -import java.math.BigDecimal; -import java.sql.Date; -import java.util.UUID; - -import org.jooq.Record3; -import org.jooq.impl.UpdatableRecordImpl; - -import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReasonsAppeal; - - -/** - * Причины обжалования уровень РФ - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ReasonsAppealRecord extends UpdatableRecordImpl { - - private static final long serialVersionUID = 1L; - - /** - * Setter for appeals.reasons_appeal.id_reasons_appeal. - */ - public void setIdReasonsAppeal(Long value) { - set(0, value); - } - - /** - * Getter for appeals.reasons_appeal.id_reasons_appeal. - */ - public Long getIdReasonsAppeal() { - return (Long) get(0); - } - - /** - * Setter for appeals.reasons_appeal.appeal. Обжалования - */ - public void setAppeal(BigDecimal value) { - set(1, value); - } - - /** - * Getter for appeals.reasons_appeal.appeal. Обжалования - */ - public BigDecimal getAppeal() { - return (BigDecimal) get(1); - } - - /** - * Setter for appeals.reasons_appeal.incorrect_inf. - * Некорректные сведения - */ - public void setIncorrectInf(BigDecimal value) { - set(2, value); - } - - /** - * Getter for appeals.reasons_appeal.incorrect_inf. - * Некорректные сведения - */ - public BigDecimal getIncorrectInf() { - return (BigDecimal) get(2); - } - - /** - * Setter for appeals.reasons_appeal.no_data. Нет данных - */ - public void setNoData(BigDecimal value) { - set(3, value); - } - - /** - * Getter for appeals.reasons_appeal.no_data. Нет данных - */ - public BigDecimal getNoData() { - return (BigDecimal) get(3); - } - - /** - * Setter for appeals.reasons_appeal.other. Прочее - */ - public void setOther(BigDecimal value) { - set(4, value); - } - - /** - * Getter for appeals.reasons_appeal.other. Прочее - */ - public BigDecimal getOther() { - return (BigDecimal) get(4); - } - - /** - * Setter for appeals.reasons_appeal.recording_date. Дата - * записи - */ - public void setRecordingDate(Date value) { - set(5, value); - } - - /** - * Getter for appeals.reasons_appeal.recording_date. Дата - * записи - */ - public Date getRecordingDate() { - return (Date) get(5); - } - - /** - * Setter for appeals.reasons_appeal.incorrect_inf_percent. - * Некорректные сведения в процентах - */ - public void setIncorrectInfPercent(BigDecimal value) { - set(6, value); - } - - /** - * Getter for appeals.reasons_appeal.incorrect_inf_percent. - * Некорректные сведения в процентах - */ - public BigDecimal getIncorrectInfPercent() { - return (BigDecimal) get(6); - } - - /** - * Setter for appeals.reasons_appeal.no_data_percent. Нет - * данных в процентах - */ - public void setNoDataPercent(BigDecimal value) { - set(7, value); - } - - /** - * Getter for appeals.reasons_appeal.no_data_percent. Нет - * данных в процентах - */ - public BigDecimal getNoDataPercent() { - return (BigDecimal) get(7); - } - - /** - * Setter for appeals.reasons_appeal.other_percent. Прочее в - * процентах - */ - public void setOtherPercent(BigDecimal value) { - set(8, value); - } - - /** - * Getter for appeals.reasons_appeal.other_percent. Прочее в - * процентах - */ - public BigDecimal getOtherPercent() { - return (BigDecimal) get(8); - } - - /** - * Setter for appeals.reasons_appeal.recruitment_id. - */ - public void setRecruitmentId(UUID value) { - set(9, value); - } - - /** - * Getter for appeals.reasons_appeal.recruitment_id. - */ - public UUID getRecruitmentId() { - return (UUID) get(9); - } - - /** - * Setter for appeals.reasons_appeal.sending_documents. Досыл - * документов - */ - public void setSendingDocuments(BigDecimal value) { - set(10, value); - } - - /** - * Getter for appeals.reasons_appeal.sending_documents. Досыл - * документов - */ - public BigDecimal getSendingDocuments() { - return (BigDecimal) get(10); - } - - /** - * Setter for appeals.reasons_appeal.sending_documents_percent. - * Досыл документов (проценты) - */ - public void setSendingDocumentsPercent(BigDecimal value) { - set(11, value); - } - - /** - * Getter for appeals.reasons_appeal.sending_documents_percent. - * Досыл документов (проценты) - */ - public BigDecimal getSendingDocumentsPercent() { - return (BigDecimal) get(11); - } - - /** - * Setter for appeals.reasons_appeal.complaint_withdrawal. - * Отзыв жалобы - */ - public void setComplaintWithdrawal(BigDecimal value) { - set(12, value); - } - - /** - * Getter for appeals.reasons_appeal.complaint_withdrawal. - * Отзыв жалобы - */ - public BigDecimal getComplaintWithdrawal() { - return (BigDecimal) get(12); - } - - /** - * Setter for - * appeals.reasons_appeal.complaint_withdrawal_percent. Отзыв - * жалобы (проценты) - */ - public void setComplaintWithdrawalPercent(BigDecimal value) { - set(13, value); - } - - /** - * Getter for - * appeals.reasons_appeal.complaint_withdrawal_percent. Отзыв - * жалобы (проценты) - */ - public BigDecimal getComplaintWithdrawalPercent() { - return (BigDecimal) get(13); - } - - /** - * Setter for appeals.reasons_appeal.decision_disagreement. - * Несогласие с решением - */ - public void setDecisionDisagreement(BigDecimal value) { - set(14, value); - } - - /** - * Getter for appeals.reasons_appeal.decision_disagreement. - * Несогласие с решением - */ - public BigDecimal getDecisionDisagreement() { - return (BigDecimal) get(14); - } - - /** - * Setter for - * appeals.reasons_appeal.decision_disagreement_persent. - * Несогласие с решением (проценты) - */ - public void setDecisionDisagreementPersent(BigDecimal value) { - set(15, value); - } - - /** - * Getter for - * appeals.reasons_appeal.decision_disagreement_persent. - * Несогласие с решением (проценты) - */ - public BigDecimal getDecisionDisagreementPersent() { - return (BigDecimal) get(15); - } - - /** - * Setter for appeals.reasons_appeal.schema. 'Department' - - * обычный ВК, 'Organization' - главный ВК региона, 'Region' - главный ВК - * военного округа, - * 'Ministry' - уровень РФ, 'REG_LVL' - сумма всех ВК региона, - * 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ - */ - public void setSchema(String value) { - set(16, value); - } - - /** - * Getter for appeals.reasons_appeal.schema. 'Department' - - * обычный ВК, 'Organization' - главный ВК региона, 'Region' - главный ВК - * военного округа, - * 'Ministry' - уровень РФ, 'REG_LVL' - сумма всех ВК региона, - * 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ - */ - public String getSchema() { - return (String) get(16); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record3 key() { - return (Record3) super.key(); - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached ReasonsAppealRecord - */ - public ReasonsAppealRecord() { - super(ReasonsAppeal.REASONS_APPEAL); - } - - /** - * Create a detached, initialised ReasonsAppealRecord - */ - public ReasonsAppealRecord(Long idReasonsAppeal, BigDecimal appeal, BigDecimal incorrectInf, BigDecimal noData, BigDecimal other, Date recordingDate, BigDecimal incorrectInfPercent, BigDecimal noDataPercent, BigDecimal otherPercent, UUID recruitmentId, BigDecimal sendingDocuments, BigDecimal sendingDocumentsPercent, BigDecimal complaintWithdrawal, BigDecimal complaintWithdrawalPercent, BigDecimal decisionDisagreement, BigDecimal decisionDisagreementPersent, String schema) { - super(ReasonsAppeal.REASONS_APPEAL); - - setIdReasonsAppeal(idReasonsAppeal); - setAppeal(appeal); - setIncorrectInf(incorrectInf); - setNoData(noData); - setOther(other); - setRecordingDate(recordingDate); - setIncorrectInfPercent(incorrectInfPercent); - setNoDataPercent(noDataPercent); - setOtherPercent(otherPercent); - setRecruitmentId(recruitmentId); - setSendingDocuments(sendingDocuments); - setSendingDocumentsPercent(sendingDocumentsPercent); - setComplaintWithdrawal(complaintWithdrawal); - setComplaintWithdrawalPercent(complaintWithdrawalPercent); - setDecisionDisagreement(decisionDisagreement); - setDecisionDisagreementPersent(decisionDisagreementPersent); - setSchema(schema); - resetChangedOnNotNull(); - } -} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReviewProgressRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReviewProgressRecord.java new file mode 100644 index 00000000..6cafe2d1 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReviewProgressRecord.java @@ -0,0 +1,218 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.appeals.tables.records; + + +import java.math.BigDecimal; +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record4; +import org.jooq.impl.UpdatableRecordImpl; + +import ru.micord.ervu_dashboard.db_beans.appeals.tables.ReviewProgress; + + +/** + * Ход рассмотрения + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReviewProgressRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for appeals.review_progress.id_review_progress. + */ + public void setIdReviewProgress(Long value) { + set(0, value); + } + + /** + * Getter for appeals.review_progress.id_review_progress. + */ + public Long getIdReviewProgress() { + return (Long) get(0); + } + + /** + * Setter for appeals.review_progress.recruitment_id. + */ + public void setRecruitmentId(UUID value) { + set(1, value); + } + + /** + * Getter for appeals.review_progress.recruitment_id. + */ + public UUID getRecruitmentId() { + return (UUID) get(1); + } + + /** + * Setter for appeals.review_progress.schema. + */ + public void setSchema(String value) { + set(2, value); + } + + /** + * Getter for appeals.review_progress.schema. + */ + public String getSchema() { + return (String) get(2); + } + + /** + * Setter for appeals.review_progress.recording_date. + */ + public void setRecordingDate(Date value) { + set(3, value); + } + + /** + * Getter for appeals.review_progress.recording_date. + */ + public Date getRecordingDate() { + return (Date) get(3); + } + + /** + * Setter for appeals.review_progress.in_work. в работе + */ + public void setInWork(BigDecimal value) { + set(4, value); + } + + /** + * Getter for appeals.review_progress.in_work. в работе + */ + public BigDecimal getInWork() { + return (BigDecimal) get(4); + } + + /** + * Setter for appeals.review_progress.decided. решено + */ + public void setDecided(BigDecimal value) { + set(5, value); + } + + /** + * Getter for appeals.review_progress.decided. решено + */ + public BigDecimal getDecided() { + return (BigDecimal) get(5); + } + + /** + * Setter for appeals.review_progress.revoked. отозвано + */ + public void setRevoked(BigDecimal value) { + set(6, value); + } + + /** + * Getter for appeals.review_progress.revoked. отозвано + */ + public BigDecimal getRevoked() { + return (BigDecimal) get(6); + } + + /** + * Setter for appeals.review_progress.in_work_percent. + */ + public void setInWorkPercent(BigDecimal value) { + set(7, value); + } + + /** + * Getter for appeals.review_progress.in_work_percent. + */ + public BigDecimal getInWorkPercent() { + return (BigDecimal) get(7); + } + + /** + * Setter for appeals.review_progress.decided_percent. + */ + public void setDecidedPercent(BigDecimal value) { + set(8, value); + } + + /** + * Getter for appeals.review_progress.decided_percent. + */ + public BigDecimal getDecidedPercent() { + return (BigDecimal) get(8); + } + + /** + * Setter for appeals.review_progress.revoked_percent. + */ + public void setRevokedPercent(BigDecimal value) { + set(9, value); + } + + /** + * Getter for appeals.review_progress.revoked_percent. + */ + public BigDecimal getRevokedPercent() { + return (BigDecimal) get(9); + } + + /** + * Setter for appeals.review_progress.total_appeals. + */ + public void setTotalAppeals(BigDecimal value) { + set(10, value); + } + + /** + * Getter for appeals.review_progress.total_appeals. + */ + public BigDecimal getTotalAppeals() { + return (BigDecimal) get(10); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record4 key() { + return (Record4) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ReviewProgressRecord + */ + public ReviewProgressRecord() { + super(ReviewProgress.REVIEW_PROGRESS); + } + + /** + * Create a detached, initialised ReviewProgressRecord + */ + public ReviewProgressRecord(Long idReviewProgress, UUID recruitmentId, String schema, Date recordingDate, BigDecimal inWork, BigDecimal decided, BigDecimal revoked, BigDecimal inWorkPercent, BigDecimal decidedPercent, BigDecimal revokedPercent, BigDecimal totalAppeals) { + super(ReviewProgress.REVIEW_PROGRESS); + + setIdReviewProgress(idReviewProgress); + setRecruitmentId(recruitmentId); + setSchema(schema); + setRecordingDate(recordingDate); + setInWork(inWork); + setDecided(decided); + setRevoked(revoked); + setInWorkPercent(inWorkPercent); + setDecidedPercent(decidedPercent); + setRevokedPercent(revokedPercent); + setTotalAppeals(totalAppeals); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/TopicAppealRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/TopicAppealRecord.java index 3199e9ee..f48a51fd 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/TopicAppealRecord.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/TopicAppealRecord.java @@ -52,44 +52,12 @@ public class TopicAppealRecord extends UpdatableRecordImpl { return (BigDecimal) get(1); } - /** - * Setter for appeals.topic_appeal.sabpoena. Тема обжалования - * повестки - */ - public void setSabpoena(BigDecimal value) { - set(2, value); - } - - /** - * Getter for appeals.topic_appeal.sabpoena. Тема обжалования - * повестки - */ - public BigDecimal getSabpoena() { - return (BigDecimal) get(2); - } - - /** - * Setter for appeals.topic_appeal.appear. Тема обжалования - * явка - */ - public void setAppear(BigDecimal value) { - set(3, value); - } - - /** - * Getter for appeals.topic_appeal.appear. Тема обжалования - * явка - */ - public BigDecimal getAppear() { - return (BigDecimal) get(3); - } - /** * Setter for appeals.topic_appeal.temporary_measures. Тема * обжалования временные меры */ public void setTemporaryMeasures(BigDecimal value) { - set(4, value); + set(2, value); } /** @@ -97,21 +65,21 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования временные меры */ public BigDecimal getTemporaryMeasures() { - return (BigDecimal) get(4); + return (BigDecimal) get(2); } /** * Setter for appeals.topic_appeal.recording_date. Дата записи */ public void setRecordingDate(Date value) { - set(5, value); + set(3, value); } /** * Getter for appeals.topic_appeal.recording_date. Дата записи */ public Date getRecordingDate() { - return (Date) get(5); + return (Date) get(3); } /** @@ -119,7 +87,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования постановка на учет в процентах */ public void setRegistrationPercent(BigDecimal value) { - set(6, value); + set(4, value); } /** @@ -127,7 +95,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования постановка на учет в процентах */ public BigDecimal getRegistrationPercent() { - return (BigDecimal) get(6); + return (BigDecimal) get(4); } /** @@ -135,7 +103,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования повестки в процентах */ public void setSabpoenaPercent(BigDecimal value) { - set(7, value); + set(5, value); } /** @@ -143,7 +111,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования повестки в процентах */ public BigDecimal getSabpoenaPercent() { - return (BigDecimal) get(7); + return (BigDecimal) get(5); } /** @@ -151,7 +119,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования явка в процентах */ public void setAppearPercent(BigDecimal value) { - set(8, value); + set(6, value); } /** @@ -159,7 +127,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * обжалования явка в процентах */ public BigDecimal getAppearPercent() { - return (BigDecimal) get(8); + return (BigDecimal) get(6); } /** @@ -167,7 +135,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * Тема обжалования временные меры в процентах */ public void setTemporaryMeasuresPercent(BigDecimal value) { - set(9, value); + set(7, value); } /** @@ -175,21 +143,21 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * Тема обжалования временные меры в процентах */ public BigDecimal getTemporaryMeasuresPercent() { - return (BigDecimal) get(9); + return (BigDecimal) get(7); } /** * Setter for appeals.topic_appeal.recruitment_id. */ public void setRecruitmentId(UUID value) { - set(10, value); + set(8, value); } /** * Getter for appeals.topic_appeal.recruitment_id. */ public UUID getRecruitmentId() { - return (UUID) get(10); + return (UUID) get(8); } /** @@ -200,7 +168,7 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ */ public void setSchema(String value) { - set(11, value); + set(9, value); } /** @@ -211,7 +179,83 @@ public class TopicAppealRecord extends UpdatableRecordImpl { * 'MD_LVL' - сумма всех ВК ВО, 'Country' - все ВК РФ */ public String getSchema() { - return (String) get(11); + return (String) get(9); + } + + /** + * Setter for appeals.topic_appeal.recruitment_campaign. + * Решения призывной комиссии + */ + public void setRecruitmentCampaign(BigDecimal value) { + set(10, value); + } + + /** + * Getter for appeals.topic_appeal.recruitment_campaign. + * Решения призывной комиссии + */ + public BigDecimal getRecruitmentCampaign() { + return (BigDecimal) get(10); + } + + /** + * Setter for + * appeals.topic_appeal.recruitment_campaign_percent. + */ + public void setRecruitmentCampaignPercent(BigDecimal value) { + set(11, value); + } + + /** + * Getter for + * appeals.topic_appeal.recruitment_campaign_percent. + */ + public BigDecimal getRecruitmentCampaignPercent() { + return (BigDecimal) get(11); + } + + /** + * Setter for appeals.topic_appeal.making_changes. Внесение + * изменений + */ + public void setMakingChanges(BigDecimal value) { + set(12, value); + } + + /** + * Getter for appeals.topic_appeal.making_changes. Внесение + * изменений + */ + public BigDecimal getMakingChanges() { + return (BigDecimal) get(12); + } + + /** + * Setter for appeals.topic_appeal.making_changes_percent. + */ + public void setMakingChangesPercent(BigDecimal value) { + set(13, value); + } + + /** + * Getter for appeals.topic_appeal.making_changes_percent. + */ + public BigDecimal getMakingChangesPercent() { + return (BigDecimal) get(13); + } + + /** + * Setter for appeals.topic_appeal.total_appeals. + */ + public void setTotalAppeals(BigDecimal value) { + set(14, value); + } + + /** + * Getter for appeals.topic_appeal.total_appeals. + */ + public BigDecimal getTotalAppeals() { + return (BigDecimal) get(14); } // ------------------------------------------------------------------------- @@ -237,13 +281,11 @@ public class TopicAppealRecord extends UpdatableRecordImpl { /** * Create a detached, initialised TopicAppealRecord */ - public TopicAppealRecord(Long idTopicAppeal, BigDecimal registration, BigDecimal sabpoena, BigDecimal appear, BigDecimal temporaryMeasures, Date recordingDate, BigDecimal registrationPercent, BigDecimal sabpoenaPercent, BigDecimal appearPercent, BigDecimal temporaryMeasuresPercent, UUID recruitmentId, String schema) { + public TopicAppealRecord(Long idTopicAppeal, BigDecimal registration, BigDecimal temporaryMeasures, Date recordingDate, BigDecimal registrationPercent, BigDecimal sabpoenaPercent, BigDecimal appearPercent, BigDecimal temporaryMeasuresPercent, UUID recruitmentId, String schema, BigDecimal recruitmentCampaign, BigDecimal recruitmentCampaignPercent, BigDecimal makingChanges, BigDecimal makingChangesPercent, BigDecimal totalAppeals) { super(TopicAppeal.TOPIC_APPEAL); setIdTopicAppeal(idTopicAppeal); setRegistration(registration); - setSabpoena(sabpoena); - setAppear(appear); setTemporaryMeasures(temporaryMeasures); setRecordingDate(recordingDate); setRegistrationPercent(registrationPercent); @@ -252,6 +294,11 @@ public class TopicAppealRecord extends UpdatableRecordImpl { setTemporaryMeasuresPercent(temporaryMeasuresPercent); setRecruitmentId(recruitmentId); setSchema(schema); + setRecruitmentCampaign(recruitmentCampaign); + setRecruitmentCampaignPercent(recruitmentCampaignPercent); + setMakingChanges(makingChanges); + setMakingChangesPercent(makingChangesPercent); + setTotalAppeals(totalAppeals); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index f384828a..9fc17caa 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -65,6 +65,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitmentCorrespondences; @@ -350,6 +351,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** + * The table ervu_dashboard.reason_dict. + */ + public final ReasonDict REASON_DICT = ReasonDict.REASON_DICT; + /** * Справочник статусов ЕРВУ */ @@ -464,6 +470,7 @@ public class ErvuDashboard extends SchemaImpl { Prosecution.PROSECUTION, PubRecruitment.PUB_RECRUITMENT, Punishment.PUNISHMENT, + ReasonDict.REASON_DICT, RecruitErvuStatus.RECRUIT_ERVU_STATUS, Recruitment.RECRUITMENT, RecruitmentCorrespondences.RECRUITMENT_CORRESPONDENCES, diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index ac3ccf5d..1f1c9edb 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -61,6 +61,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitmentCorrespondences; @@ -119,6 +120,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyR import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubRecruitmentRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ReasonDictRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitErvuStatusRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentCorrespondencesRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord; @@ -202,6 +204,7 @@ public class Keys { public static final UniqueKey PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final UniqueKey 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 PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true); + public static final UniqueKey REASON_DICT_PKEY = Internal.createUniqueKey(ReasonDict.REASON_DICT, DSL.name("reason_dict_pkey"), new TableField[] { ReasonDict.REASON_DICT.CODE }, true); public static final UniqueKey RECRUIT_ERVU_STATUS_CODE_UNIQUE_KEY = Internal.createUniqueKey(RecruitErvuStatus.RECRUIT_ERVU_STATUS, DSL.name("recruit_ervu_status_code_unique_key"), new TableField[] { RecruitErvuStatus.RECRUIT_ERVU_STATUS.CODE }, true); public static final UniqueKey RECRUIT_ERVU_STATUS_PKEY = Internal.createUniqueKey(RecruitErvuStatus.RECRUIT_ERVU_STATUS, DSL.name("recruit_ervu_status_pkey"), new TableField[] { RecruitErvuStatus.RECRUIT_ERVU_STATUS.RECRUIT_ERVU_STATUS_ID }, true); public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.IDM_ID }, true); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index 91e0c033..c02cadec 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -56,6 +56,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitmentCorrespondences; @@ -334,6 +335,11 @@ public class Tables { */ public static final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** + * The table ervu_dashboard.reason_dict. + */ + public static final ReasonDict REASON_DICT = ReasonDict.REASON_DICT; + /** * Справочник статусов ЕРВУ */ diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java index 290048cf..6baab661 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java @@ -120,7 +120,7 @@ public class Citizen extends TableImpl { * The column ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public final TableField REASON_REGISTRATION = createField(DSL.name("reason_registration"), SQLDataType.VARCHAR, this, "Причина постановки на учёт"); + public final TableField REASON_REGISTRATION = createField(DSL.name("reason_registration"), SQLDataType.INTEGER, this, "Причина постановки на учёт"); /** * The column ervu_dashboard.citizen.driver_license. diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java new file mode 100644 index 00000000..5ae3a740 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java @@ -0,0 +1,229 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import java.sql.Timestamp; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ReasonDictRecord; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReasonDict extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.reason_dict + */ + public static final ReasonDict REASON_DICT = new ReasonDict(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ReasonDictRecord.class; + } + + /** + * The column ervu_dashboard.reason_dict.code. + */ + public final TableField CODE = createField(DSL.name("code"), SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column ervu_dashboard.reason_dict.description. + */ + public final TableField DESCRIPTION = createField(DSL.name("description"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column ervu_dashboard.reason_dict.created_at. + */ + public final TableField CREATED_AT = createField(DSL.name("created_at"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.TIMESTAMP)), this, ""); + + private ReasonDict(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private ReasonDict(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.reason_dict table reference + */ + public ReasonDict(String alias) { + this(DSL.name(alias), REASON_DICT); + } + + /** + * Create an aliased ervu_dashboard.reason_dict table reference + */ + public ReasonDict(Name alias) { + this(alias, REASON_DICT); + } + + /** + * Create a ervu_dashboard.reason_dict table reference + */ + public ReasonDict() { + this(DSL.name("reason_dict"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.REASON_DICT_PKEY; + } + + @Override + public ReasonDict as(String alias) { + return new ReasonDict(DSL.name(alias), this); + } + + @Override + public ReasonDict as(Name alias) { + return new ReasonDict(alias, this); + } + + @Override + public ReasonDict as(Table alias) { + return new ReasonDict(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(String name) { + return new ReasonDict(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(Name name) { + return new ReasonDict(name, null); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(Table name) { + return new ReasonDict(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Condition condition) { + return new ReasonDict(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java index 76d40cac..0c109fb4 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java @@ -196,7 +196,7 @@ public class CitizenRecord extends UpdatableRecordImpl { * Setter for ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public void setReasonRegistration(String value) { + public void setReasonRegistration(Integer value) { set(11, value); } @@ -204,8 +204,8 @@ public class CitizenRecord extends UpdatableRecordImpl { * Getter for ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public String getReasonRegistration() { - return (String) get(11); + public Integer getReasonRegistration() { + return (Integer) get(11); } /** @@ -1909,7 +1909,7 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Create a detached, initialised CitizenRecord */ - public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense, Boolean hasCriminalProsecution, Boolean hasSentence, Boolean servingSentence, Boolean hasCriminalRecord, Boolean hasSentSummons, Boolean hasServedSummons, Boolean appearedToRecruitmentCenter, Boolean notAppearedByValidExcuse, Boolean hasActiveTemporaryMeasure, String systemEsiaId, Boolean educated, Boolean hasEducationDiploma, Boolean hasForeignEducationDiploma, Boolean hasMilitaryDepartmentEducation, Boolean hasMilitaryTrainingCenterEducation, Boolean hasActualAcademicLeave) { + public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, Integer reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense, Boolean hasCriminalProsecution, Boolean hasSentence, Boolean servingSentence, Boolean hasCriminalRecord, Boolean hasSentSummons, Boolean hasServedSummons, Boolean appearedToRecruitmentCenter, Boolean notAppearedByValidExcuse, Boolean hasActiveTemporaryMeasure, String systemEsiaId, Boolean educated, Boolean hasEducationDiploma, Boolean hasForeignEducationDiploma, Boolean hasMilitaryDepartmentEducation, Boolean hasMilitaryTrainingCenterEducation, Boolean hasActualAcademicLeave) { super(Citizen.CITIZEN); setResidence(residence); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java new file mode 100644 index 00000000..d05e6b65 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java @@ -0,0 +1,96 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReasonDictRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.reason_dict.code. + */ + public void setCode(Integer value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.code. + */ + public Integer getCode() { + return (Integer) get(0); + } + + /** + * Setter for ervu_dashboard.reason_dict.description. + */ + public void setDescription(String value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.description. + */ + public String getDescription() { + return (String) get(1); + } + + /** + * Setter for ervu_dashboard.reason_dict.created_at. + */ + public void setCreatedAt(Timestamp value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.created_at. + */ + public Timestamp getCreatedAt() { + return (Timestamp) get(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ReasonDictRecord + */ + public ReasonDictRecord() { + super(ReasonDict.REASON_DICT); + } + + /** + * Create a detached, initialised ReasonDictRecord + */ + public ReasonDictRecord(Integer code, String description, Timestamp createdAt) { + super(ReasonDict.REASON_DICT); + + setCode(code); + setDescription(description); + setCreatedAt(createdAt); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/ConsiderationComplaint.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/ConsiderationComplaint.java index f92fe9fc..1db4d107 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/ConsiderationComplaint.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/ConsiderationComplaint.java @@ -89,6 +89,12 @@ public class ConsiderationComplaint extends TableImpl ID_REGION = createField(DSL.name("id_region"), SQLDataType.UUID.nullable(false), this, ""); + /** + * The column ratings.consideration_complaint.region_code. Код + * региона + */ + public final TableField REGION_CODE = createField(DSL.name("region_code"), SQLDataType.VARCHAR, this, "Код региона"); + private ConsiderationComplaint(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/records/ConsiderationComplaintRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/records/ConsiderationComplaintRecord.java index dc162c24..c47f17ab 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/records/ConsiderationComplaintRecord.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ratings/tables/records/ConsiderationComplaintRecord.java @@ -118,6 +118,22 @@ public class ConsiderationComplaintRecord extends UpdatableRecordImplratings.consideration_complaint.region_code. Код + * региона + */ + public void setRegionCode(String value) { + set(6, value); + } + + /** + * Getter for ratings.consideration_complaint.region_code. Код + * региона + */ + public String getRegionCode() { + return (String) get(6); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -141,7 +157,7 @@ public class ConsiderationComplaintRecord extends UpdatableRecordImple46cd965-7fb5-4407-83ee-ce4a4f19926c VB - Обжалование и Способ получения true + false false @@ -890,6 +891,7 @@ e98b94a1-b3a8-43f7-a2e0-0dd7a10444dd Горизонтальный контейнер true + false false @@ -1535,7 +1537,6 @@ df8c2e9e-3be4-4e85-b05e-70b605dfe89e HB - Средний срок рассмотрения true - false false @@ -1626,13 +1627,13 @@ decimalDelimiter -"." +null decimalLength -1.0 +null @@ -1759,7 +1760,7 @@ decimalPlaces - 1.0 + null @@ -1818,6 +1819,13 @@ 0da5354c-cc4c-4cdb-a878-88e6d2e95a33 AC_color false + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + dc383620-6c1f-407d-80ef-c2b1d4107248 + AC_color_success + false false false @@ -1825,42 +1833,6 @@ elseActions - - - - - behavior - - {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "error" - - - - - - - - - @@ -1954,7 +1926,7 @@ operation -"LESS_THAN_OR_EQUAL" +"LESS_THAN" @@ -2028,7 +2000,41 @@ thenActions - + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + @@ -2064,7 +2070,552 @@ - + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 986fcf9c-66d4-4093-b4ef-a49f82654c91 + AC_color_white + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"266dbddf-c172-4e62-887e-b11d985e56ae","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"266dbddf-c172-4e62-887e-b11d985e56ae","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 5.0 + + + + + + + operation + +"GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"266dbddf-c172-4e62-887e-b11d985e56ae","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + +"AND" + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 1904a6cf-deab-47ee-b508-67e16a0ced25 + AC_color_error + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"266dbddf-c172-4e62-887e-b11d985e56ae","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"266dbddf-c172-4e62-887e-b11d985e56ae","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"GREATER_THAN" + + + + + + + + + + + + + logicalOperation + +"OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"2ba507a7-ab2b-475a-a202-60800b899d75","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + @@ -2084,6 +2635,7 @@ afe272c4-ff79-41a7-a14c-a1e62491cceb HB - Оценка удовлетворенности true + false false @@ -2175,6 +2727,12 @@ textFormatter + + billionsLabel + +null + + decimalDelimiter @@ -2184,7 +2742,7 @@ decimalLength -2.0 +1.0 @@ -2657,7 +3215,7 @@ 98594cec-0a9b-4cef-af09-e1b71cb2ad9e f4e6f000-d931-47e9-aa5c-683edc9fa159 - AC_color_warning + AC_color_white false false false @@ -2850,41 +3408,7 @@ thenActions - - - - - behavior - - {"objectId":"a4b76f79-4242-4c16-a0ce-bbff1e844812","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "warning" - - - - - - - - + @@ -3428,7 +3952,6 @@ 8c67dd1b-6abe-4f51-99d5-96e7ea662e27 HB - ЕПГУ true - false false @@ -3508,7 +4031,7 @@ replaceModels - + @@ -3579,9 +4102,8 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 2f722279-9212-4bca-aa35-3e7d573fdabf - HB - Очно + HB - ПОС true - false false @@ -3604,7 +4126,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 03fe3c3a-cde7-4436-90f0-399f417b7bd4 - Очно + ПОС false false @@ -3612,7 +4134,7 @@ initialValue - "Очно" + "ПОС" @@ -3736,7 +4258,6 @@ c4f4ea06-65fa-4b7b-b3ab-186a217f049f VB - Причины обжалования, основной профиль, тема обжалования true - false false @@ -3746,9 +4267,8 @@ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 0ce7314c-f89e-4639-921f-5edef681d3fc - VB - Причины обжалования + VB - Ход рассмотрения true - false false @@ -3784,7 +4304,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"reasons_appeal","schemaName":"appeals","x":292.0,"y":212.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"reasons_appeal","schemaName":"appeals","x":292.0,"y":212.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"reasons_appeal":{"tableName":"reasons_appeal","schemaName":"appeals","x":292.0,"y":212.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_progress","schemaName":"appeals","x":451.0,"y":261.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]},{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_progress","schemaName":"appeals","x":451.0,"y":261.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]},{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"review_progress":{"tableName":"review_progress","schemaName":"appeals","x":451.0,"y":261.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Ministry\""]},{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -3884,7 +4404,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"reasons_appeal","schemaName":"appeals","x":219.0,"y":157.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"reasons_appeal","schemaName":"appeals","x":219.0,"y":157.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"reasons_appeal":{"tableName":"reasons_appeal","schemaName":"appeals","x":219.0,"y":157.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_progress","schemaName":"appeals","x":409.0,"y":314.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_progress","schemaName":"appeals","x":409.0,"y":314.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"review_progress":{"tableName":"review_progress","schemaName":"appeals","x":409.0,"y":314.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -3897,7 +4417,7 @@ replacePkColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recruitment_id"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recruitment_id"} @@ -3912,7 +4432,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 b786b570-98ac-4de4-944b-90a670201e2f - Причины обжалования + Ход рассмотрения false false @@ -3930,7 +4450,7 @@ initialValue - "Причины обжалования" + "Ход рассмотрения" @@ -3959,7 +4479,23 @@ VB - график true false - + + + + style + + + + width + + "50%" + + + + + + + @@ -4040,7 +4576,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"reasons_appeal","schemaName":"appeals","x":403.20000000000005,"y":283.2,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"reasons_appeal","schemaName":"appeals","x":403.20000000000005,"y":283.2,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"reasons_appeal":{"tableName":"reasons_appeal","schemaName":"appeals","x":403.20000000000005,"y":283.2,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_progress","schemaName":"appeals","x":272.0,"y":298.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_progress","schemaName":"appeals","x":272.0,"y":298.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"review_progress":{"tableName":"review_progress","schemaName":"appeals","x":272.0,"y":298.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -4053,7 +4589,7 @@ valueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"appeal"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"total_appeals"} @@ -4106,7 +4642,7 @@ aggregationColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"sending_documents"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"in_work"} @@ -4124,7 +4660,7 @@ label - "Досыл документов" + "В работе" @@ -4136,37 +4672,7 @@ aggregationColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"complaint_withdrawal"} - - - - aggregationFunction - - "MAX" - - - - backgroundColor - - "#F91E11FF" - - - - label - - "Отзыв жалобы" - - - - - - - - - - aggregationColumn - - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"decision_disagreement"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"decided"} @@ -4184,19 +4690,19 @@ label - "Несогласие с решением" + "Решено" - + aggregationColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"incorrect_inf"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"revoked"} @@ -4208,24 +4714,25 @@ backgroundColor - "#4D66CCFF" + "#F91E11FF" label - "Некорректные данные" + "Отозвано" + dataLabel - "Причины обжалования" + "Ход рассмотрения" @@ -4250,7 +4757,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"reasons_appeal","schemaName":"appeals","x":399.20000000000016,"y":252.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"reasons_appeal","schemaName":"appeals","x":399.20000000000016,"y":252.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"reasons_appeal":{"tableName":"reasons_appeal","schemaName":"appeals","x":399.20000000000016,"y":252.0,"alias":"reasons_appeal","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"review_progress","schemaName":"appeals","x":376.0,"y":306.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"review_progress","schemaName":"appeals","x":376.0,"y":306.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"review_progress":{"tableName":"review_progress","schemaName":"appeals","x":376.0,"y":306.0,"alias":"review_progress","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"appeals","table":"review_progress","entity":"review_progress","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -4455,7 +4962,7 @@ table - "reasons_appeal" + "review_progress" @@ -4522,6 +5029,18 @@ +decimalDelimiter + + "." + + + +decimalLength + + 1.0 + + + labelValueIndex 1.0 @@ -4594,6 +5113,19 @@ + + style + + + + width + + "40%" + + + + + @@ -4603,7 +5135,7 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 54406883-bc58-4383-9aa0-88f6d034a6e9 -HB - Досыл документов +HB - В работе true false @@ -4614,7 +5146,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 6ed43978-854c-4508-8e3c-e3830746784a - Досыл документов + В работе false false @@ -4633,7 +5165,7 @@ initialValue - "Досыл документов" + "В работе" @@ -4791,7 +5323,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"sending_documents"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"in_work"} @@ -4813,7 +5345,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"sending_documents"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"in_work"} @@ -4893,7 +5425,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"sending_documents_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"in_work_percent"} @@ -4915,7 +5447,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"sending_documents_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"in_work_percent"} @@ -4929,7 +5461,7 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 4faa9ab4-4fb4-434e-bcf7-dd407bab2c99 -HB - Отзыв жалобы +HB - Решено true false @@ -4950,7 +5482,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 353fcd13-5b99-496a-863d-6b0c78130f6d - Отзыв жалобы + Решено false false @@ -4960,7 +5492,7 @@ - "legend-col-red" + "legend-col-green" @@ -4969,7 +5501,7 @@ initialValue - "Отзыв жалобы" + "Решено" @@ -5114,7 +5646,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"complaint_withdrawal"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"decided"} @@ -5136,7 +5668,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"complaint_withdrawal"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"decided"} @@ -5216,7 +5748,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"complaint_withdrawal_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"decided_percent"} @@ -5238,7 +5770,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"complaint_withdrawal_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"decided_percent"} @@ -5254,327 +5786,12 @@ 77d19e69-30a0-43a0-9c0c-b61707316ee0 HB - Несогласие с решением true -false - - - - cssClasses - - - - - - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - b8a96b46-b53f-4788-9348-80527900ab0a - Несогласие с решением - false - false - - - - cssClasses - - - - "legend-col-green" - - - - - - - initialValue - - "Несогласие с решением" - - - - - - - - - false - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - e7de76d6-c41d-4377-b882-2ccc936ecd53 - VB - значения - true - false - - - - cssClasses - - - - "pull-right" - - - - - - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8945b1ed-d0f1-47ae-92ff-88240dbdc7ac - 0.3 млн. шт. - false - false - - - - cssClasses - - - -"text-invert" - - - - - - - initialValue - - null - - - - label - - null - - - - textFormatter - - - -decimalDelimiter - - "." - - - -decimalLength - - 1.0 - - - -millionsLabel - - "млн. шт." - - - -replaceDataLabel - - "шт." - - - -replaceModels - - - - - - value - - "0" - - - - - - - - -thousandsLabel - - "тыс. шт." - - - -unitsLabel - - "шт." - - - -unitsText - - {"objectId":"8945b1ed-d0f1-47ae-92ff-88240dbdc7ac","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"decision_disagreement"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"decision_disagreement"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8bf68ecd-b8a0-4fc8-af3f-e577c3e9caf5 - 3% - false - false - - - - cssClasses - - - -"text-invert" - - - - -"mute" - - - - - - initialValue - - null - - - - label - - "%" - - - - textFormatter - - - -replaceModels - - - - - - value - - "0" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"decision_disagreement_persent"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"decision_disagreement_persent"} - - - - - - false - - - +true d7d54cfb-26b5-4dba-b56f-b6247183c24d 5a972e64-10fd-44fa-bea5-ec5cdedc61c8 -HB - Некорректные данные +HB - Отозвано true false @@ -5585,7 +5802,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 dc8c50de-070e-465d-99cd-0356ad6ac14d - Некорректные данные + Отозвано false false @@ -5595,7 +5812,7 @@ - "legend-col-dark-blue" + "legend-col-red" @@ -5604,7 +5821,7 @@ initialValue - "Некорректные данные" + "Отозвано" @@ -5762,7 +5979,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"incorrect_inf"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"revoked"} @@ -5784,7 +6001,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"incorrect_inf"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"revoked"} @@ -5864,7 +6081,7 @@ defaultValueColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"incorrect_inf_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"revoked_percent"} @@ -5886,7 +6103,7 @@ valueByEventColumn - {"schema":"appeals","table":"reasons_appeal","entity":"reasons_appeal","name":"incorrect_inf_percent"} + {"schema":"appeals","table":"review_progress","entity":"review_progress","name":"revoked_percent"} @@ -5905,6 +6122,7 @@ da58168b-acfe-4244-bf52-5ecbf922efb0 HB - Основной профиль, тема обжалования true + false false @@ -5938,6 +6156,7 @@ a67eb649-5948-4c4f-abcd-4a02447f7606 VB - Основной профиль true + false false @@ -7274,9 +7493,8 @@ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 7400430e-1e24-4164-a3fd-8f3417446729 - VB - Тема обжалования + VB - Предмет обжалования true - false false @@ -7440,7 +7658,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 92ed0c9f-d347-4956-95cd-deac1e5981ed - Тема обжалования + Предмет обжалования false false @@ -7458,7 +7676,7 @@ initialValue - "Тема обжалования" + "Предмет обжалования" @@ -7618,7 +7836,7 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d a9b1cca6-429e-43cd-929a-0acce927e8a0 - HB - повестки + HB - Внесение изменений true false @@ -7642,7 +7860,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 b6a84aa5-bfb0-48a9-8a6a-61b7b16bde19 -Повестки +Внесение изменений false false @@ -7650,7 +7868,7 @@ initialValue - "Повестки" + "Внесение изменений" @@ -7728,7 +7946,7 @@ defaultValueColumn - {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"sabpoena_percent"} + {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"making_changes_percent"} @@ -7750,7 +7968,7 @@ valueByEventColumn - {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"sabpoena_percent"} + {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"making_changes_percent"} @@ -7763,7 +7981,7 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 6d045f82-560d-4ccd-8a78-6dc529bcf9e0 - HB - явка + HB - Решения призывной комиссии true false @@ -7787,7 +8005,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 0d439c8e-0d8b-4403-b362-c6f04a632a64 -Явка +Решения призывной комиссии false false @@ -7795,7 +8013,7 @@ initialValue - "Явка" + "Решения призывной комиссии" @@ -7873,7 +8091,7 @@ defaultValueColumn - {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"appear_percent"} + {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"recruitment_campaign_percent"} @@ -7895,7 +8113,7 @@ valueByEventColumn - {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"appear_percent"} + {"schema":"appeals","table":"topic_appeal","entity":"topic_appeal","name":"recruitment_campaign_percent"} @@ -8058,6 +8276,7 @@ fff9b1e6-9177-428a-b066-3235f688ecc5 VB - Рейтинг рассмотрения жалоб true + false false @@ -8261,7 +8480,7 @@ 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 a88126e7-de17-49bc-b1fb-27856bbb1b06 - Регион + Субъект РФ false false @@ -8300,7 +8519,7 @@ displayName - "Регион" + "Субъект РФ" @@ -8321,7 +8540,7 @@ 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 be418211-b5df-4c7a-9565-4389c852d7ba - Средний срок рассмотрения + Срок false false false @@ -8356,30 +8575,6 @@ colorsForValue - - - - - color - - "#FFFFFFFF" - - - - operator - - "LESS_OR_EQUAL" - - - - value - - "5" - - - - - @@ -8395,6 +8590,54 @@ "GREATER" + + value + + "7" + + + + + + + + + + color + + "#FFFFFFFF" + + + + operator + + "GREATER_OR_EQUAL" + + + + value + + "5" + + + + + + + + + + color + + "#00DB5BFF" + + + + operator + + "LESS" + + value @@ -8462,7 +8705,7 @@ displayName - "Средний срок рассмотрения" + "Срок" @@ -8482,6 +8725,12 @@ null + + + width + + 110 + @@ -8489,7 +8738,7 @@ 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 a8ff5478-f3c2-4891-8efa-ee5897f49c59 - Оценка удовл-ти + Оценка false false false @@ -8558,7 +8807,7 @@ color - "#FFC737FF" + "#FFFFFFFF" @@ -8622,7 +8871,7 @@ displayName - "Оценка удовл-ти" + "Оценка" @@ -8646,7 +8895,7 @@ width - 130 + 110 @@ -8659,13 +8908,6 @@ - - 16071adb-3bdf-4c33-b29b-886876016415 - e028c8db-afc5-4c3e-bcd0-0fca49629daa - Grid_худшие - true - true - d7d54cfb-26b5-4dba-b56f-b6247183c24d 66526307-2ef2-4e45-ba42-9db221d61e15 diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index c159eb4b..37ae1c29 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -10918,7 +10918,6 @@ 74bd7ce7-31af-452b-9ef0-06e049a786c6 HB - Средний срок рассмотрения true - false false @@ -11003,13 +11002,13 @@ decimalDelimiter - "." + null decimalLength - 1.0 + null @@ -11142,7 +11141,7 @@ decimalPlaces - 1.0 + null @@ -11195,47 +11194,19 @@ e2142cca-4742-4c56-862d-0ae5da837c93 AC_color_error false +true + + +98594cec-0a9b-4cef-af09-e1b71cb2ad9e +f901b840-1705-4652-9be8-fedee4d160bd +AC_color_success +false false elseActions - - - - -behavior - - {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} - - - -method - - "addCssClass" - - - -value - - - - staticValue - - - string - - - "error" - - - - - - - - @@ -11329,7 +11300,7 @@ operation - "LESS_THAN_OR_EQUAL" + "LESS_THAN" @@ -11414,6 +11385,41 @@ method + + "addCssClass" + + + +value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method "removeCssClass" @@ -11438,8 +11444,550 @@ - - + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "removeCssClass" + + + +value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + +98594cec-0a9b-4cef-af09-e1b71cb2ad9e +3623b8f0-c4f4-4e2b-a657-802841c38803 +AC_color_white +false +false + + + + elseActions + + + + + + + eventRefs + + + + + +behavior + + {"objectId":"9bf044ee-e91d-4d23-b8ad-c1834b95d670","packageName":"component.field","className":"NumberField","type":"TS"} + + + +propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"9bf044ee-e91d-4d23-b8ad-c1834b95d670","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 5.0 + + + + + + + operation + + "GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"9bf044ee-e91d-4d23-b8ad-c1834b95d670","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + + "LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + + "AND" + + + + + + + thenActions + + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "removeCssClass" + + + +value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "removeCssClass" + + + +value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + + +98594cec-0a9b-4cef-af09-e1b71cb2ad9e +6209c92e-ed46-40b8-8ef5-d96f3d9305b9 +AC_color_error +false +false + + + + elseActions + + + + + + + eventRefs + + + + + +behavior + + {"objectId":"9bf044ee-e91d-4d23-b8ad-c1834b95d670","packageName":"component.field","className":"NumberField","type":"TS"} + + + +propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"9bf044ee-e91d-4d23-b8ad-c1834b95d670","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + + "GREATER_THAN" + + + + + + + + + + + + + logicalOperation + + "OR" + + + + + + + thenActions + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "addCssClass" + + + +value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "removeCssClass" + + + +value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + +behavior + + {"objectId":"95c3344c-677e-4819-a385-fa18fc06b096","packageName":"component","className":"Text","type":"TS"} + + + +method + + "removeCssClass" + + + +value + + + + staticValue + + + string + + + "warning" + + + + + + + + @@ -11466,6 +12014,7 @@ 74063a6c-beeb-482c-9c84-dbe4818c5f3e HB - Оценка удовлетворенности true + false false @@ -11560,7 +12109,7 @@ decimalLength - 2.0 + 1.0 @@ -12026,7 +12575,7 @@ 98594cec-0a9b-4cef-af09-e1b71cb2ad9e 1c107b6b-65cc-481e-a2c2-feb57d037e32 -AC_color_warning +AC_color_white false false @@ -12218,41 +12767,7 @@ thenActions - - - - -behavior - - {"objectId":"d6e45bb4-0d02-44c6-8489-e5ff6dc7c80a","packageName":"component","className":"Text","type":"TS"} - - - -method - - "addCssClass" - - - -value - - - - staticValue - - - string - - - "warning" - - - - - - - - + diff --git a/resources/src/main/resources/business-model/ratings.page b/resources/src/main/resources/business-model/ratings.page index da58298d..c736123f 100644 --- a/resources/src/main/resources/business-model/ratings.page +++ b/resources/src/main/resources/business-model/ratings.page @@ -766,6 +766,7 @@ aca06a3f-55ff-4c8b-87ed-1aa8651fd19c VB - Явка по повестке true + false false @@ -1473,6 +1474,7 @@ faca77fc-bc58-4e88-9398-b1b87c21509a VB - Призыв true + false false @@ -2351,7 +2353,6 @@ 24093a0e-73a1-4847-b317-b1231f608636 Grid_лучшие true - false false @@ -2416,7 +2417,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"consideration_complaint":{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"consideration_complaint","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":172.0,"y":441.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":172.0,"y":441.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"consideration_complaint":{"tableName":"consideration_complaint","schemaName":"ratings","x":197.0,"y":272.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":435.0,"y":316.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_correspondences":{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":172.0,"y":441.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"consideration_complaint","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"recruitment_correspondences","refToEntityName":"consideration_complaint","refToColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"region_code"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"recruitment_correspondences","entity":"recruitment_correspondences","name":"pos_code"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0} @@ -2502,7 +2503,7 @@ field - {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"shortname"} + {"schema":"ervu_dashboard","table":"recruitment_correspondences","entity":"recruitment_correspondences","name":"region_name"} @@ -2602,7 +2603,6 @@ 6802c2f7-5706-4a65-bf0e-2ccae2ec2b69 Grid_худшие true - false false @@ -2672,7 +2672,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"consideration_complaint":{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"consideration_complaint","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":168.0,"y":425.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":168.0,"y":425.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"consideration_complaint":{"tableName":"consideration_complaint","schemaName":"ratings","x":264.0,"y":283.0,"alias":"consideration_complaint","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"consideration_complaint_percent"},"operation":"LESS_THAN","typeCode":"CONST","values":["50"]},{"column":{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":523.0,"y":328.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"schema"},"operation":"EQUAL","typeCode":"CONST","values":["\"Organization\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_correspondences":{"tableName":"recruitment_correspondences","schemaName":"ervu_dashboard","x":168.0,"y":425.0,"alias":"recruitment_correspondences","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"consideration_complaint","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"id_region"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"recruitment_correspondences","refToEntityName":"consideration_complaint","refToColumns":[{"schema":"ratings","table":"consideration_complaint","entity":"consideration_complaint","name":"region_code"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"recruitment_correspondences","entity":"recruitment_correspondences","name":"pos_code"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0} @@ -2758,7 +2758,7 @@ field - {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"shortname"} + {"schema":"ervu_dashboard","table":"recruitment_correspondences","entity":"recruitment_correspondences","name":"region_name"} diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index 0bb589ec..21f9644e 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -844,7 +844,6 @@ 7206a4d4-1dd2-4a36-bad7-a692bf291d79 VB - Призыв true - false false @@ -11984,7 +11983,7 @@ decimalDelimiter -"." +null @@ -12010,6 +12009,12 @@ + + unitsLabel + +"дн." + + unitsText @@ -12073,7 +12078,7 @@ decimalPlaces - 1.0 + null @@ -12121,59 +12126,26 @@ false - + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - 9427e817-1be8-44bb-9e65-3e760fff56f0 - AC_color + 366bc49e-b2a6-4e05-8559-bfc42ce11ec4 + AC_color_success false + false false elseActions - - - - - behavior - - {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "error" - - - - - - - - - + + eventRefs - + @@ -12200,7 +12172,7 @@ conditions - + @@ -12259,7 +12231,7 @@ operation -"LESS_THAN_OR_EQUAL" +"LESS_THAN" @@ -12268,7 +12240,7 @@ - + @@ -12333,8 +12305,42 @@ thenActions - - + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + @@ -12365,6 +12371,552 @@ + + + + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 219d9367-5bf2-40d1-bc7d-1f98c5d9ae19 + AC_color_white + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"27f5fdac-fd30-418a-81ea-30d67572cdf2","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"27f5fdac-fd30-418a-81ea-30d67572cdf2","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 5.0 + + + + + + + operation + +"GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"27f5fdac-fd30-418a-81ea-30d67572cdf2","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + +"AND" + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + a94f5f0c-60df-4b6d-b111-4e5d0c9fc798 + AC_color_error + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"27f5fdac-fd30-418a-81ea-30d67572cdf2","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"27f5fdac-fd30-418a-81ea-30d67572cdf2","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"GREATER_THAN" + + + + + + + + + + + + + logicalOperation + +"OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + behavior + + {"objectId":"e8893347-f8a6-41d2-a181-79e6d59f86dc","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + @@ -12445,11 +12997,7 @@ "text-invert" - - - "error" - - + "pull-right" @@ -12538,6 +13086,12 @@ false + + decimalPlaces + + 1.0 + + visible @@ -12583,93 +13137,26 @@ false - + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - 7000ee04-daa8-4eda-99c3-92a1457f22a0 - AC_color + 44145516-b30c-4475-8062-6a022804892e + AC_color_error false + false false elseActions - - - - - behavior - - {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "success" - - - - - - - - - - - - - behavior - - {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} - - - - method - - "removeCssClass" - - - - value - - - - staticValue - - - string - - - "error" - - - - - - - - + + eventRefs - + @@ -12696,7 +13183,7 @@ conditions - + @@ -12746,7 +13233,7 @@ number - 3.5 + 3.0 @@ -12764,7 +13251,7 @@ - + @@ -12829,7 +13316,7 @@ thenActions - + @@ -12864,7 +13351,7 @@ - + @@ -12895,6 +13382,552 @@ + + + + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2b7944b7-d333-4887-a2e8-db304255030f + AC_color_white + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"f7a9d903-8f1e-4f1f-b8ca-6ff7cc722519","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"f7a9d903-8f1e-4f1f-b8ca-6ff7cc722519","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 3.0 + + + + + + + operation + +"GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"f7a9d903-8f1e-4f1f-b8ca-6ff7cc722519","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 4.0 + + + + + + + operation + +"LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + +"AND" + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 7c70e223-c7b4-46c8-abe6-480eba891d37 + AC_color_success + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"f7a9d903-8f1e-4f1f-b8ca-6ff7cc722519","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"f7a9d903-8f1e-4f1f-b8ca-6ff7cc722519","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 4.0 + + + + + + + operation + +"GREATER_THAN" + + + + + + + + + + + + + logicalOperation + +"OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"55272a90-3137-4ca9-9612-3333032e8e59","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + @@ -12954,6 +13987,7 @@ e720e961-bd68-4e3d-bf2f-4a9d4ac59f87 Осень true + false false @@ -14439,7 +15473,7 @@ decimalDelimiter -"." +null @@ -14465,6 +15499,12 @@ + + unitsLabel + +"дн." + + unitsText @@ -14528,7 +15568,7 @@ decimalPlaces - 1.0 + null @@ -14576,59 +15616,26 @@ false - + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - b05e7315-e543-4223-8c88-6dce05a23694 - AC_color + 3f82f73c-56b6-4437-8ad9-38d809904e8e + AC_color_success false + false false elseActions - - - - - behavior - - {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "error" - - - - - - - - - + + eventRefs - + @@ -14655,7 +15662,7 @@ conditions - + @@ -14714,7 +15721,7 @@ operation -"LESS_THAN_OR_EQUAL" +"LESS_THAN" @@ -14723,7 +15730,7 @@ - + @@ -14788,8 +15795,349 @@ thenActions - - + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 4281313e-6d81-4a77-857d-ea7c920a74d2 + AC_color_white + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"aefd49b7-c780-49ec-9282-ad3265e76947","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"aefd49b7-c780-49ec-9282-ad3265e76947","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 5.0 + + + + + + + operation + +"GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"aefd49b7-c780-49ec-9282-ad3265e76947","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + +"AND" + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + @@ -14829,6 +16177,245 @@ + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 352ab30b-9a0b-402d-b722-5a4c65ba0dbb + AC_color_error + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"aefd49b7-c780-49ec-9282-ad3265e76947","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"aefd49b7-c780-49ec-9282-ad3265e76947","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 7.0 + + + + + + + operation + +"GREATER_THAN" + + + + + + + + + + + + + logicalOperation + +"OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + behavior + + {"objectId":"416231c0-0e93-4931-9fb4-2372e6f3a826","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 37661cf7-8534-4571-adfd-3808cf8e62d3 @@ -14842,7 +16429,6 @@ 9661fbc4-ea41-4206-95f0-e15b0fc8c3e3 HB - оценка удовлетворенности true -false false @@ -14907,11 +16493,7 @@ "text-invert" - - - "error" - - + "pull-right" @@ -15005,6 +16587,12 @@ false + + decimalPlaces + + 1.0 + + visible @@ -15050,87 +16638,20 @@ false - + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e - e36be511-ac31-4690-8d05-56d192c1d611 - AC_color + 408c756d-f5d1-443a-a05d-3afd8d83c832 + AC_color_error false + false false elseActions - - - - - behavior - - {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} - - - - method - - "addCssClass" - - - - value - - - - staticValue - - - string - - - "success" - - - - - - - - - - - - - behavior - - {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} - - - - method - - "removeCssClass" - - - - value - - - - staticValue - - - string - - - "error" - - - - - - - - + + @@ -15213,7 +16734,7 @@ number - 3.5 + 3.0 @@ -15362,6 +16883,552 @@ + + + + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + d838083e-2ef0-4cc6-90fe-e21222ba63a2 + AC_color_white + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"0eb853e3-b509-4c89-b6e0-e6e7372f8158","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"0eb853e3-b509-4c89-b6e0-e6e7372f8158","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 3.0 + + + + + + + operation + +"GREATER_THAN_OR_EQUAL" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"0eb853e3-b509-4c89-b6e0-e6e7372f8158","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 4.0 + + + + + + + operation + +"LESS_THAN_OR_EQUAL" + + + + + + + + + + + + logicalOperation + +"AND" + + + + + + + thenActions + + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 1f25588c-a555-441a-a4b9-4533033e6064 + AC_color_success + false + false + false + + + + elseActions + + + + + + + eventRefs + + + + + + behavior + + {"objectId":"0eb853e3-b509-4c89-b6e0-e6e7372f8158","packageName":"component.field","className":"NumberField","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + + conditions + + + + + + _isGroupSelected + + false + + + + one + + + + conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"0eb853e3-b509-4c89-b6e0-e6e7372f8158","packageName":"component.field","className":"NumberField","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + conditionSecondPart + + + + staticValue + + + number + + + 4.0 + + + + + + + operation + +"GREATER_THAN" + + + + + + + + + + + + + logicalOperation + +"OR" + + + + + + + thenActions + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "addCssClass" + + + + value + + + + staticValue + + + string + + + "success" + + + + + + + + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "error" + + + + + + + + + + + + + behavior + + {"objectId":"fe63e7cd-f597-4f0c-b195-bb5fbe26520a","packageName":"component","className":"Text","type":"TS"} + + + + method + + "removeCssClass" + + + + value + + + + staticValue + + + string + + + "warning" + + + +