ERVU-481 change filter and

add table vehicle_categories

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/Keys.java

@@ -39,7 +39,6 @@ public class Keys {
     public static final UniqueKey<MainProfileRecord> 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<ReasonsAppealRecord> 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<ReviewRatingRecord> 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<ReviewRatingRecord> UNIQUE_REVIEW_RATING = Internal.createUniqueKey(ReviewRating.REVIEW_RATING, DSL.name("unique_review_rating"), new TableField[] { ReviewRating.REVIEW_RATING.RECRUITMENT_ID, ReviewRating.REVIEW_RATING.RECORDING_DATE, ReviewRating.REVIEW_RATING.SCHEMA, ReviewRating.REVIEW_RATING.ID_FOR_VIEW }, true);
     public static final UniqueKey<TopicAppealRecord> 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);
 
     // -------------------------------------------------------------------------

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/AppealsList.java

@@ -230,6 +230,11 @@ public class AppealsList extends TableImpl<AppealsListRecord> {
      */
     public final TableField<AppealsListRecord, UUID> REGION_ID = createField(DSL.name("region_id"), SQLDataType.UUID, this, "idm_id региональных ВК (у которых schema = 'Organization')");
 
+    /**
+     * The column <code>appeals.appeals_list.system_esia_id</code>.
+     */
+    public final TableField<AppealsListRecord, String> SYSTEM_ESIA_ID = createField(DSL.name("system_esia_id"), SQLDataType.VARCHAR, this, "");
+
     private AppealsList(Name alias, Table<AppealsListRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/MainProfile.java

@@ -65,12 +65,12 @@ public class MainProfile extends TableImpl<MainProfileRecord> {
     /**
      * The column <code>appeals.main_profile.age</code>. Возраст
      */
-    public final TableField<MainProfileRecord, String> AGE = createField(DSL.name("age"), SQLDataType.CLOB, this, "Возраст");
+    public final TableField<MainProfileRecord, Integer> AGE = createField(DSL.name("age"), SQLDataType.INTEGER, this, "Возраст");
 
     /**
      * The column <code>appeals.main_profile.child_min_18</code>. Дети до 18 лет
      */
-    public final TableField<MainProfileRecord, String> CHILD_MIN_18 = createField(DSL.name("child_min_18"), SQLDataType.CLOB, this, "Дети до 18 лет");
+    public final TableField<MainProfileRecord, Integer> CHILD_MIN_18 = createField(DSL.name("child_min_18"), SQLDataType.INTEGER, this, "Дети до 18 лет");
 
     /**
      * The column <code>appeals.main_profile.education</code>. Образование

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java

@@ -101,11 +101,6 @@ public class ReviewRating extends TableImpl<ReviewRatingRecord> {
      */
     public final TableField<ReviewRatingRecord, String> 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 <code>appeals.review_rating.id_for_view</code>.
-     */
-    public final TableField<ReviewRatingRecord, UUID> ID_FOR_VIEW = createField(DSL.name("id_for_view"), SQLDataType.UUID.nullable(false), this, "");
-
     private ReviewRating(Name alias, Table<ReviewRatingRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }
@@ -181,11 +176,6 @@ public class ReviewRating extends TableImpl<ReviewRatingRecord> {
         return Keys.PK_REVIEW_RATING;
     }
 
-    @Override
-    public List<UniqueKey<ReviewRatingRecord>> getUniqueKeys() {
-        return Arrays.asList(Keys.UNIQUE_REVIEW_RATING);
-    }
-
     @Override
     public List<ForeignKey<ReviewRatingRecord, ?>> getReferences() {
         return Arrays.asList(Keys.REVIEW_RATING__FK_REGION);

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/AppealsListRecord.java

@@ -507,6 +507,20 @@ public class AppealsListRecord extends UpdatableRecordImpl<AppealsListRecord> {
         return (UUID) get(31);
     }
 
+    /**
+     * Setter for <code>appeals.appeals_list.system_esia_id</code>.
+     */
+    public void setSystemEsiaId(String value) {
+        set(32, value);
+    }
+
+    /**
+     * Getter for <code>appeals.appeals_list.system_esia_id</code>.
+     */
+    public String getSystemEsiaId() {
+        return (String) get(32);
+    }
+
     // -------------------------------------------------------------------------
     // Primary key information
     // -------------------------------------------------------------------------
@@ -530,7 +544,7 @@ public class AppealsListRecord extends UpdatableRecordImpl<AppealsListRecord> {
     /**
      * Create a detached, initialised AppealsListRecord
      */
-    public AppealsListRecord(Integer number, String epguNum, String source, String region, String category, String subcategory, String fact, String incomingOrg, String currentOrg, String incomingDate, String planEndDate, String factEndDate, String stage, String status, String overdue, String fastTrack, String fz, String solutionType, String sentByEmailToNotConnectedFoiv, String responseEvalution, String reconsideration, String coordinatorOrg, String coordinatorFio, String contractorOrg, String contractorFio, String headOrg, String headFio, String issueDate, Timestamp uploadDate, String reasonsAppeal, String topicAppeal, UUID regionId) {
+    public AppealsListRecord(Integer number, String epguNum, String source, String region, String category, String subcategory, String fact, String incomingOrg, String currentOrg, String incomingDate, String planEndDate, String factEndDate, String stage, String status, String overdue, String fastTrack, String fz, String solutionType, String sentByEmailToNotConnectedFoiv, String responseEvalution, String reconsideration, String coordinatorOrg, String coordinatorFio, String contractorOrg, String contractorFio, String headOrg, String headFio, String issueDate, Timestamp uploadDate, String reasonsAppeal, String topicAppeal, UUID regionId, String systemEsiaId) {
         super(AppealsList.APPEALS_LIST);
 
         setNumber(number);
@@ -565,6 +579,7 @@ public class AppealsListRecord extends UpdatableRecordImpl<AppealsListRecord> {
         setReasonsAppeal(reasonsAppeal);
         setTopicAppeal(topicAppeal);
         setRegionId(regionId);
+        setSystemEsiaId(systemEsiaId);
         resetChangedOnNotNull();
     }
 }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/MainProfileRecord.java

@@ -52,29 +52,29 @@ public class MainProfileRecord extends UpdatableRecordImpl<MainProfileRecord> {
     /**
      * Setter for <code>appeals.main_profile.age</code>. Возраст
      */
-    public void setAge(String value) {
+    public void setAge(Integer value) {
         set(2, value);
     }
 
     /**
      * Getter for <code>appeals.main_profile.age</code>. Возраст
      */
-    public String getAge() {
+    public Integer getAge() {
-        return (String) get(2);
+        return (Integer) get(2);
     }
 
     /**
      * Setter for <code>appeals.main_profile.child_min_18</code>. Дети до 18 лет
      */
-    public void setChildMin_18(String value) {
+    public void setChildMin_18(Integer value) {
         set(3, value);
     }
 
     /**
      * Getter for <code>appeals.main_profile.child_min_18</code>. Дети до 18 лет
      */
-    public String getChildMin_18() {
+    public Integer getChildMin_18() {
-        return (String) get(3);
+        return (Integer) get(3);
     }
 
     /**
@@ -178,7 +178,7 @@ public class MainProfileRecord extends UpdatableRecordImpl<MainProfileRecord> {
     /**
      * Create a detached, initialised MainProfileRecord
      */
-    public MainProfileRecord(Long idMainProfile, String gender, String age, String childMin_18, String education, String employment, Date recordingDate, UUID recruitmentId, String schema) {
+    public MainProfileRecord(Long idMainProfile, String gender, Integer age, Integer childMin_18, String education, String employment, Date recordingDate, UUID recruitmentId, String schema) {
         super(MainProfile.MAIN_PROFILE);
 
         setIdMainProfile(idMainProfile);

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/appeals/tables/records/ReviewRatingRecord.java

@@ -132,20 +132,6 @@ public class ReviewRatingRecord extends UpdatableRecordImpl<ReviewRatingRecord>
         return (String) get(6);
     }
 
-    /**
-     * Setter for <code>appeals.review_rating.id_for_view</code>.
-     */
-    public void setIdForView(UUID value) {
-        set(7, value);
-    }
-
-    /**
-     * Getter for <code>appeals.review_rating.id_for_view</code>.
-     */
-    public UUID getIdForView() {
-        return (UUID) get(7);
-    }
-
     // -------------------------------------------------------------------------
     // Primary key information
     // -------------------------------------------------------------------------
@@ -169,7 +155,7 @@ public class ReviewRatingRecord extends UpdatableRecordImpl<ReviewRatingRecord>
     /**
      * Create a detached, initialised ReviewRatingRecord
      */
-    public ReviewRatingRecord(Long idReviewRating, BigDecimal speed, BigDecimal rating, Date recordingDate, Long idRegion, UUID recruitmentId, String schema, UUID idForView) {
+    public ReviewRatingRecord(Long idReviewRating, BigDecimal speed, BigDecimal rating, Date recordingDate, Long idRegion, UUID recruitmentId, String schema) {
         super(ReviewRating.REVIEW_RATING);
 
         setIdReviewRating(idReviewRating);
@@ -179,7 +165,6 @@ public class ReviewRatingRecord extends UpdatableRecordImpl<ReviewRatingRecord>
         setIdRegion(idRegion);
         setRecruitmentId(recruitmentId);
         setSchema(schema);
-        setIdForView(idForView);
         resetChangedOnNotNull();
     }
 }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java

@@ -67,6 +67,7 @@ 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.Subpoena;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
+import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.VehicleCategories;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
 
 
@@ -356,6 +357,11 @@ public class ErvuDashboard extends SchemaImpl {
      */
     public final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES;
 
+    /**
+     * The table <code>ervu_dashboard.vehicle_categories</code>.
+     */
+    public final VehicleCategories VEHICLE_CATEGORIES = VehicleCategories.VEHICLE_CATEGORIES;
+
     /**
      * сведения об имуществе
      */
@@ -442,6 +448,7 @@ public class ErvuDashboard extends SchemaImpl {
             Recruitment.RECRUITMENT,
             Subpoena.SUBPOENA,
             TemporaryMeasures.TEMPORARY_MEASURES,
+            VehicleCategories.VEHICLE_CATEGORIES,
             Work.WORK
         );
     }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java

@@ -63,6 +63,7 @@ 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.Subpoena;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
+import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.VehicleCategories;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ArrayMildisRecord;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ArrayRegRecord;
@@ -117,6 +118,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitEr
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.SubpoenaRecord;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord;
+import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.VehicleCategoriesRecord;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.WorkRecord;
 
 
@@ -197,6 +199,7 @@ public class Keys {
     public static final UniqueKey<RecruitmentRecord> RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.IDM_ID }, true);
     public static final UniqueKey<SubpoenaRecord> SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUB_ID }, true);
     public static final UniqueKey<TemporaryMeasuresRecord> TEMPORARY_MEASURES_PKEY = Internal.createUniqueKey(TemporaryMeasures.TEMPORARY_MEASURES, DSL.name("temporary_measures_pkey"), new TableField[] { TemporaryMeasures.TEMPORARY_MEASURES.TEMPORARY_MEASURES_ID }, true);
+    public static final UniqueKey<VehicleCategoriesRecord> VEHICLE_CATEGORIES_PKEY = Internal.createUniqueKey(VehicleCategories.VEHICLE_CATEGORIES, DSL.name("vehicle_categories_pkey"), new TableField[] { VehicleCategories.VEHICLE_CATEGORIES.CODE }, true);
     public static final UniqueKey<WorkRecord> PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true);
 
     // -------------------------------------------------------------------------

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java

@@ -58,6 +58,7 @@ 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.Subpoena;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
+import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.VehicleCategories;
 import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
 
 
@@ -340,6 +341,11 @@ public class Tables {
      */
     public static final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES;
 
+    /**
+     * The table <code>ervu_dashboard.vehicle_categories</code>.
+     */
+    public static final VehicleCategories VEHICLE_CATEGORIES = VehicleCategories.VEHICLE_CATEGORIES;
+
     /**
      * сведения об имуществе
      */

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/VehicleCategories.java

@@ -0,0 +1,258 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables;
+
+
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.jooq.Check;
+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.Internal;
+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.VehicleCategoriesRecord;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class VehicleCategories extends TableImpl<VehicleCategoriesRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The reference instance of <code>ervu_dashboard.vehicle_categories</code>
+     */
+    public static final VehicleCategories VEHICLE_CATEGORIES = new VehicleCategories();
+
+    /**
+     * The class holding records for this type
+     */
+    @Override
+    public Class<VehicleCategoriesRecord> getRecordType() {
+        return VehicleCategoriesRecord.class;
+    }
+
+    /**
+     * The column <code>ervu_dashboard.vehicle_categories.code</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, String> CODE = createField(DSL.name("code"), SQLDataType.VARCHAR(5).nullable(false), this, "");
+
+    /**
+     * The column <code>ervu_dashboard.vehicle_categories.name</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, String> NAME = createField(DSL.name("name"), SQLDataType.CLOB.nullable(false), this, "");
+
+    /**
+     * The column <code>ervu_dashboard.vehicle_categories.description</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, String> DESCRIPTION = createField(DSL.name("description"), SQLDataType.CLOB, this, "");
+
+    /**
+     * The column
+     * <code>ervu_dashboard.vehicle_categories.is_driver_license</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, Boolean> IS_DRIVER_LICENSE = createField(DSL.name("is_driver_license"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "");
+
+    /**
+     * The column <code>ervu_dashboard.vehicle_categories.created_at</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, Timestamp> CREATED_AT = createField(DSL.name("created_at"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.TIMESTAMP)), this, "");
+
+    /**
+     * The column <code>ervu_dashboard.vehicle_categories.updated_at</code>.
+     */
+    public final TableField<VehicleCategoriesRecord, Timestamp> UPDATED_AT = createField(DSL.name("updated_at"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.TIMESTAMP)), this, "");
+
+    private VehicleCategories(Name alias, Table<VehicleCategoriesRecord> aliased) {
+        this(alias, aliased, (Field<?>[]) null, null);
+    }
+
+    private VehicleCategories(Name alias, Table<VehicleCategoriesRecord> aliased, Field<?>[] parameters, Condition where) {
+        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
+    }
+
+    /**
+     * Create an aliased <code>ervu_dashboard.vehicle_categories</code> table
+     * reference
+     */
+    public VehicleCategories(String alias) {
+        this(DSL.name(alias), VEHICLE_CATEGORIES);
+    }
+
+    /**
+     * Create an aliased <code>ervu_dashboard.vehicle_categories</code> table
+     * reference
+     */
+    public VehicleCategories(Name alias) {
+        this(alias, VEHICLE_CATEGORIES);
+    }
+
+    /**
+     * Create a <code>ervu_dashboard.vehicle_categories</code> table reference
+     */
+    public VehicleCategories() {
+        this(DSL.name("vehicle_categories"), null);
+    }
+
+    @Override
+    public Schema getSchema() {
+        return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
+    }
+
+    @Override
+    public UniqueKey<VehicleCategoriesRecord> getPrimaryKey() {
+        return Keys.VEHICLE_CATEGORIES_PKEY;
+    }
+
+    @Override
+    public List<Check<VehicleCategoriesRecord>> getChecks() {
+        return Arrays.asList(
+            Internal.createCheck(this, DSL.name("vehicle_categories_code_check"), "(((length((code)::text) >= 1) AND (length((code)::text) <= 5)))", true)
+        );
+    }
+
+    @Override
+    public VehicleCategories as(String alias) {
+        return new VehicleCategories(DSL.name(alias), this);
+    }
+
+    @Override
+    public VehicleCategories as(Name alias) {
+        return new VehicleCategories(alias, this);
+    }
+
+    @Override
+    public VehicleCategories as(Table<?> alias) {
+        return new VehicleCategories(alias.getQualifiedName(), this);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VehicleCategories rename(String name) {
+        return new VehicleCategories(DSL.name(name), null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VehicleCategories rename(Name name) {
+        return new VehicleCategories(name, null);
+    }
+
+    /**
+     * Rename this table
+     */
+    @Override
+    public VehicleCategories rename(Table<?> name) {
+        return new VehicleCategories(name.getQualifiedName(), null);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories where(Condition condition) {
+        return new VehicleCategories(getQualifiedName(), aliased() ? this : null, null, condition);
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories where(Collection<? extends Condition> conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories where(Condition... conditions) {
+        return where(DSL.and(conditions));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories where(Field<Boolean> condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VehicleCategories where(SQL condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VehicleCategories where(@Stringly.SQL String condition) {
+        return where(DSL.condition(condition));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VehicleCategories where(@Stringly.SQL String condition, Object... binds) {
+        return where(DSL.condition(condition, binds));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    @PlainSQL
+    public VehicleCategories where(@Stringly.SQL String condition, QueryPart... parts) {
+        return where(DSL.condition(condition, parts));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories whereExists(Select<?> select) {
+        return where(DSL.exists(select));
+    }
+
+    /**
+     * Create an inline derived table from this table
+     */
+    @Override
+    public VehicleCategories whereNotExists(Select<?> select) {
+        return where(DSL.notExists(select));
+    }
+}

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/VehicleCategoriesRecord.java

@@ -0,0 +1,143 @@
+/*
+ * 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.VehicleCategories;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class VehicleCategoriesRecord extends UpdatableRecordImpl<VehicleCategoriesRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Setter for <code>ervu_dashboard.vehicle_categories.code</code>.
+     */
+    public void setCode(String value) {
+        set(0, value);
+    }
+
+    /**
+     * Getter for <code>ervu_dashboard.vehicle_categories.code</code>.
+     */
+    public String getCode() {
+        return (String) get(0);
+    }
+
+    /**
+     * Setter for <code>ervu_dashboard.vehicle_categories.name</code>.
+     */
+    public void setName(String value) {
+        set(1, value);
+    }
+
+    /**
+     * Getter for <code>ervu_dashboard.vehicle_categories.name</code>.
+     */
+    public String getName() {
+        return (String) get(1);
+    }
+
+    /**
+     * Setter for <code>ervu_dashboard.vehicle_categories.description</code>.
+     */
+    public void setDescription(String value) {
+        set(2, value);
+    }
+
+    /**
+     * Getter for <code>ervu_dashboard.vehicle_categories.description</code>.
+     */
+    public String getDescription() {
+        return (String) get(2);
+    }
+
+    /**
+     * Setter for
+     * <code>ervu_dashboard.vehicle_categories.is_driver_license</code>.
+     */
+    public void setIsDriverLicense(Boolean value) {
+        set(3, value);
+    }
+
+    /**
+     * Getter for
+     * <code>ervu_dashboard.vehicle_categories.is_driver_license</code>.
+     */
+    public Boolean getIsDriverLicense() {
+        return (Boolean) get(3);
+    }
+
+    /**
+     * Setter for <code>ervu_dashboard.vehicle_categories.created_at</code>.
+     */
+    public void setCreatedAt(Timestamp value) {
+        set(4, value);
+    }
+
+    /**
+     * Getter for <code>ervu_dashboard.vehicle_categories.created_at</code>.
+     */
+    public Timestamp getCreatedAt() {
+        return (Timestamp) get(4);
+    }
+
+    /**
+     * Setter for <code>ervu_dashboard.vehicle_categories.updated_at</code>.
+     */
+    public void setUpdatedAt(Timestamp value) {
+        set(5, value);
+    }
+
+    /**
+     * Getter for <code>ervu_dashboard.vehicle_categories.updated_at</code>.
+     */
+    public Timestamp getUpdatedAt() {
+        return (Timestamp) get(5);
+    }
+
+    // -------------------------------------------------------------------------
+    // Primary key information
+    // -------------------------------------------------------------------------
+
+    @Override
+    public Record1<String> key() {
+        return (Record1) super.key();
+    }
+
+    // -------------------------------------------------------------------------
+    // Constructors
+    // -------------------------------------------------------------------------
+
+    /**
+     * Create a detached VehicleCategoriesRecord
+     */
+    public VehicleCategoriesRecord() {
+        super(VehicleCategories.VEHICLE_CATEGORIES);
+    }
+
+    /**
+     * Create a detached, initialised VehicleCategoriesRecord
+     */
+    public VehicleCategoriesRecord(String code, String name, String description, Boolean isDriverLicense, Timestamp createdAt, Timestamp updatedAt) {
+        super(VehicleCategories.VEHICLE_CATEGORIES);
+
+        setCode(code);
+        setName(name);
+        setDescription(description);
+        setIsDriverLicense(isDriverLicense);
+        setCreatedAt(createdAt);
+        setUpdatedAt(updatedAt);
+        resetChangedOnNotNull();
+    }
+}

backend/src/main/resources/config/v_1.10/20250618-ERVU-481.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+					  
+	<changeSet id="0001" author="absataov">
+        <comment>edit table</comment>
+		<sql>
+            CREATE table iF NOT EXISTS vehicle_categories (
+                code VARCHAR(5) PRIMARY KEY CHECK (LENGTH(code) BETWEEN 1 AND 5),
+                name TEXT NOT NULL,
+                description TEXT,
+                is_driver_license BOOLEAN NOT NULL DEFAULT TRUE,  -- TRUE = водительское удостоверение, FALSE = удостоверение тракториста
+                created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+                updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
+            );
+
+
+            INSERT INTO vehicle_categories (code, name, description, is_driver_license) VALUES
+            -- Водительские категории (ГИБДД)
+            ('A',   'Мотоциклы', 'Все мотоциклы без ограничений по мощности', TRUE),
+            ('A1',  'Легкие мотоциклы', 'Объем двигателя до 125 см³ и мощность до 11 кВт', TRUE),
+            ('B',   'Легковые автомобили', 'ТС до 3,5 т и до 8 пассажирских мест', TRUE),
+            ('B1',  'Трициклы и квадрициклы', 'Механические ТС с тремя/четырьмя колесами', TRUE),
+            ('BE',  'Легковой с прицепом', 'Категория B с прицепом свыше 750 кг', TRUE),
+            ('C',   'Грузовые автомобили', 'ТС массой более 3,5 тонн', TRUE),
+            ('C1',  'Легкие грузовики', 'ТС от 3,5 до 7,5 тонн', TRUE),
+            ('CE',  'Грузовик с прицепом', 'Категория C с прицепом свыше 750 кг', TRUE),
+            ('C1E', 'Легкий грузовик с прицепом', 'Категория C1 с прицепом более 750 кг', TRUE),
+            ('D',   'Автобусы', 'ТС для перевозки более 8 пассажиров', TRUE),
+            ('D1',  'Малые автобусы', 'ТС от 9 до 16 пассажирских мест', TRUE),
+            ('DE',  'Автобус с прицепом', 'Категория D с прицепом', TRUE),
+            ('D1E', 'Малый автобус с прицепом', 'Категория D1 с прицепом более 750 кг', TRUE),
+            ('M',   'Мопеды', 'ТС с объемом двигателя до 50 см³ или макс. скоростью до 50 км/ч', TRUE),
+
+            -- Трактористские категории (Гостехнадзор)
+            ('AI',  'Внедорожные мотосредства', 'Снегоходы, квадроциклы, мотовездеходы', FALSE),
+            ('AII', 'Внедорожные автотранспортные средства', 'Багги, вездеходы, легкие внедорожники', FALSE),
+            ('TB',  'Колёсные машины', 'Погрузчики, катки, самоходные шасси', FALSE),
+            ('TC',  'Гусеничные машины', 'Гусеничные тракторы, бульдозеры', FALSE),
+            ('TD',  'Машины с прицепами', 'Колёсные и гусеничные машины с прицепом', FALSE),
+            ('TE',  'Специальные машины', 'Комбайны, дорожные, лесозаготовительные машины', FALSE),
+            ('TF',  'Сельхозтехника', 'Сельскохозяйственные машины (сеялки, культиваторы и др.)', FALSE)
+            ON CONFLICT (code) DO NOTHING;
+ 
+		</sql>
+	</changeSet>
+
+</databaseChangeLog>

backend/src/main/resources/config/v_1.10/changelog-1.10.xml

@@ -25,5 +25,6 @@
   <include file="20250523-ERVU-465_add_esia_id.xml" relativeToChangelogFile="true"/>
   <include file="20250526-ERVU-444_additional_education_fields.xml" relativeToChangelogFile="true"/>
   <include file="20250617-ERVU-483.xml" relativeToChangelogFile="true"/>
+  <include file="20250618-ERVU-481.xml" relativeToChangelogFile="true"/>
 
 </databaseChangeLog>

pom.xml

@@ -19,7 +19,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <enable.version.in.url>false</enable.version.in.url>
     <joda-time.version>2.9.2</joda-time.version>
-    <webbpm-platform.version>3.192.13</webbpm-platform.version>
+    <webbpm-platform.version>3.192.14</webbpm-platform.version>
     <wbp.overall-timeout>72000</wbp.overall-timeout>
   </properties>
   <dependencyManagement>

resources/src/main/resources/business-model/citizen_all_filters.page

@@ -53739,7 +53739,6 @@
     <componentRootId>e51605ff-2659-49db-8753-54cf44fd3c02</componentRootId>
     <name>Tab item_Сведения о праве управления транспортным средством</name>
     <container>true</container>
-    <expanded>false</expanded>
     <childrenReordered>false</childrenReordered>
     <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
         <properties>
@@ -54341,33 +54340,23 @@
                 <enabled>false</enabled>
             </scripts>
         </children>
-        <children id="0b68a785-b057-47f5-ae31-53d3ddd0c6c7">
+        <children id="55ad7eb5-0720-440b-9b9b-02c1ec27cfc3">
-            <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+            <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
-            <componentRootId>0b68a785-b057-47f5-ae31-53d3ddd0c6c7</componentRootId>
+            <componentRootId>55ad7eb5-0720-440b-9b9b-02c1ec27cfc3</componentRootId>
-            <name>Категории (filter)</name>
+            <name>Список (фильтр) авто</name>
             <container>false</container>
             <childrenReordered>false</childrenReordered>
-            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+            <scripts id="848c80a8-d213-48d0-be5c-c7da93c48620">
                 <properties>
                     <entry>
-                        <key>cssClasses</key>
+                        <key>maxItems</key>
                         <value>
-                            <item id="2bd70a52-f8cd-4cf6-8ef7-998ce3ed6ec1" removed="false">
+                            <simple>10.0</simple>
-<value>
-    <simple>"free-label"</simple>
-</value>
-                            </item>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>mask</key>
-                        <value>
-                            <simple>null</simple>
                         </value>
                     </entry>
                 </properties>
             </scripts>
-            <scripts id="734c5516-d349-4b42-a92a-4469760104fe">
+            <scripts id="59ec7992-f088-4dbf-8bfe-3b38d9a89408">
                 <properties>
                     <entry>
                         <key>operation</key>
@@ -54377,20 +54366,106 @@
                     </entry>
                 </properties>
             </scripts>
-            <scripts id="f893a042-cd3d-4d4a-89d1-95a9399a772b">
+            <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
                 <properties>
                     <entry>
-                        <key>columnForFilter</key>
+                        <key>comboBoxService</key>
                         <value>
-                            <simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"driver_license"}</simple>
+                            <complex>
+<entry>
+    <key>businessIdColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>columnSorts</key>
+    <value>
+        <item id="2ae3993c-a223-4d51-adc1-a404afb971c8" removed="false">
+            <value>
+                <complex>
+                    <entry>
+                        <key>field</key>
+                        <value>
+                            <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>sortOrder</key>
+                        <value>
+                            <simple>"ASC"</simple>
+                        </value>
+                    </entry>
+                </complex>
+            </value>
+        </item>
+    </value>
+</entry>
+<entry>
+    <key>displayColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>filterColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>loadDao</key>
+    <value>
+        <complex>
+            <entry>
+                <key>graph</key>
+                <value>
+                    <simple>{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"is_driver_license"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"vehicle_categories":{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+<entry>
+    <key>parentControlReference</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+                            </complex>
                         </value>
                     </entry>
                 </properties>
             </scripts>
-            <scripts id="5ba072f6-3017-4f32-9a6a-1ca5e690e1dd"/>
+            <scripts id="b17eca3b-9ec5-4462-9d6f-30bd53f91d12">
-            <scripts id="ef53357a-6f68-4479-9a05-d37cfb44b6ba"/>
+                <properties>
-            <scripts id="2e66508a-de36-4816-b32c-18f8c7c39830"/>
+                    <entry>
-            <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
+                        <key>columnForFilter</key>
+                        <value>
+                            <simple>{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"categories"}</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>dataConverter</key>
+                        <value>
+                            <implRef type="JAVA">
+<className>StringValueConverter</className>
+<packageName>component.field.dataconvert</packageName>
+                            </implRef>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
+            <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
+            <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
+        </children>
+        <children id="0b68a785-b057-47f5-ae31-53d3ddd0c6c7">
+            <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+            <componentRootId>0b68a785-b057-47f5-ae31-53d3ddd0c6c7</componentRootId>
+            <name>Категории (filter)</name>
+            <container>false</container>
+            <removed>true</removed>
         </children>
         <children id="6256a2dc-b553-4037-adad-c98063c20f3e">
             <prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
@@ -54410,7 +54485,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"0b68a785-b057-47f5-ae31-53d3ddd0c6c7","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"55ad7eb5-0720-440b-9b9b-02c1ec27cfc3","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -54571,7 +54646,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"0b68a785-b057-47f5-ae31-53d3ddd0c6c7","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"55ad7eb5-0720-440b-9b9b-02c1ec27cfc3","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -54600,13 +54675,13 @@
     </complex>
 </value>
                             </item>
-                            <item id="8777a316-4168-4452-980f-40b1d4551d86" removed="false">
+                            <item id="99d640e1-f3df-451a-a18f-d671ae13dd86" removed="false">
 <value>
     <complex>
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"0b68a785-b057-47f5-ae31-53d3ddd0c6c7","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"55ad7eb5-0720-440b-9b9b-02c1ec27cfc3","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -54624,6 +54699,7 @@
     </complex>
 </value>
                             </item>
+                            <item id="8777a316-4168-4452-980f-40b1d4551d86" removed="true"/>
                             <item id="23ef599e-f7b1-4a66-a31e-f64fc030ad3f" removed="true"/>
                             <item id="e36e271e-76f3-40de-8d36-ff0f5690aecf" removed="true"/>
                             <item id="d53585bc-11b8-4064-8c38-42aab432837e" removed="true"/>
@@ -55140,33 +55216,23 @@
                 <enabled>false</enabled>
             </scripts>
         </children>
-        <children id="137da0d7-2735-43a6-a433-ff0a122cdc9c">
+        <children id="6d8b804e-f183-4f7c-8724-1d68d1e3e91d">
-            <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+            <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
-            <componentRootId>137da0d7-2735-43a6-a433-ff0a122cdc9c</componentRootId>
+            <componentRootId>6d8b804e-f183-4f7c-8724-1d68d1e3e91d</componentRootId>
-            <name>Категории (filter)</name>
+            <name>Список (фильтр) трактор</name>
             <container>false</container>
             <childrenReordered>false</childrenReordered>
-            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+            <scripts id="848c80a8-d213-48d0-be5c-c7da93c48620">
                 <properties>
                     <entry>
-                        <key>cssClasses</key>
+                        <key>maxItems</key>
                         <value>
-                            <item id="2bd70a52-f8cd-4cf6-8ef7-998ce3ed6ec1" removed="false">
+                            <simple>10.0</simple>
-<value>
-    <simple>"free-label"</simple>
-</value>
-                            </item>
-                        </value>
-                    </entry>
-                    <entry>
-                        <key>mask</key>
-                        <value>
-                            <simple>null</simple>
                         </value>
                     </entry>
                 </properties>
             </scripts>
-            <scripts id="734c5516-d349-4b42-a92a-4469760104fe">
+            <scripts id="59ec7992-f088-4dbf-8bfe-3b38d9a89408">
                 <properties>
                     <entry>
                         <key>operation</key>
@@ -55176,7 +55242,55 @@
                     </entry>
                 </properties>
             </scripts>
-            <scripts id="f893a042-cd3d-4d4a-89d1-95a9399a772b">
+            <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                <properties>
+                    <entry>
+                        <key>comboBoxService</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>businessIdColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>displayColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>filterColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>loadDao</key>
+    <value>
+        <complex>
+            <entry>
+                <key>graph</key>
+                <value>
+                    <simple>{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"is_driver_license"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"vehicle_categories":{"tableName":"vehicle_categories","schemaName":"ervu_dashboard","x":510.0,"y":362.0,"alias":"vehicle_categories","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+<entry>
+    <key>parentControlReference</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"vehicle_categories","entity":"vehicle_categories","name":"code"}</simple>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="b17eca3b-9ec5-4462-9d6f-30bd53f91d12">
                 <properties>
                     <entry>
                         <key>columnForFilter</key>
@@ -55184,12 +55298,27 @@
                             <simple>{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"categories"}</simple>
                         </value>
                     </entry>
+                    <entry>
+                        <key>dataConverter</key>
+                        <value>
+                            <implRef type="JAVA">
+<className>StringValueConverter</className>
+<packageName>component.field.dataconvert</packageName>
+                            </implRef>
+                        </value>
+                    </entry>
                 </properties>
             </scripts>
-            <scripts id="5ba072f6-3017-4f32-9a6a-1ca5e690e1dd"/>
+            <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
-            <scripts id="ef53357a-6f68-4479-9a05-d37cfb44b6ba"/>
+            <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
-            <scripts id="2e66508a-de36-4816-b32c-18f8c7c39830"/>
+            <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
-            <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
+        </children>
+        <children id="137da0d7-2735-43a6-a433-ff0a122cdc9c">
+            <prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
+            <componentRootId>137da0d7-2735-43a6-a433-ff0a122cdc9c</componentRootId>
+            <name>Категории (filter)</name>
+            <container>false</container>
+            <removed>true</removed>
         </children>
         <children id="a82a9f9d-2c4e-45f1-95bd-a0b21b882581">
             <prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
@@ -55209,7 +55338,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"137da0d7-2735-43a6-a433-ff0a122cdc9c","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"6d8b804e-f183-4f7c-8724-1d68d1e3e91d","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -55370,7 +55499,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"137da0d7-2735-43a6-a433-ff0a122cdc9c","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"6d8b804e-f183-4f7c-8724-1d68d1e3e91d","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -55405,7 +55534,7 @@
         <entry>
             <key>behavior</key>
             <value>
-                <simple>{"objectId":"137da0d7-2735-43a6-a433-ff0a122cdc9c","packageName":"component.field","className":"TextField","type":"TS"}</simple>
+                <simple>{"objectId":"6d8b804e-f183-4f7c-8724-1d68d1e3e91d","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
             </value>
         </entry>
         <entry>
@@ -55434,6 +55563,13 @@
         </children>
     </children>
 </children>
+<children id="f3223825-b803-4a4a-8153-20d3d97d4d16">
+    <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+    <componentRootId>f3223825-b803-4a4a-8153-20d3d97d4d16</componentRootId>
+    <name>Список (фильтр)</name>
+    <container>false</container>
+    <removed>true</removed>
+</children>
 <children id="98605185-5a04-49b3-9132-269356e2625b">
     <prototypeId>84b784bf-7bec-42f5-bbb7-8a465de45019</prototypeId>
     <componentRootId>98605185-5a04-49b3-9132-269356e2625b</componentRootId>
@@ -57378,6 +57514,7 @@
     <componentRootId>f0e23de9-c1a2-4caf-9476-6191d5b1961b</componentRootId>
     <name>Tab item_Сведения о пересечении границы</name>
     <container>true</container>
+    <expanded>false</expanded>
     <childrenReordered>false</childrenReordered>
     <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
         <properties>