Merge remote-tracking branch 'origin/new_citizencard' into develop

This commit is contained in:
Makarova Elena 2024-09-30 14:58:09 +03:00
commit 71ef3d157d
68 changed files with 8132 additions and 1959 deletions

View file

@ -0,0 +1,22 @@
package component.model;
import ru.cg.webbpm.modules.webkit.annotations.Model;
/**
* @author r.latypov
*/
@Model
public class TreeItemDto {
public Object id;
public Object parentId;
public String label;
public TreeItemDto[] children;
public Object businessId;
public String domainId;
public TreeItemDto(Object id, Object parentId, String label) {
this.id = id;
this.parentId = parentId;
this.label = label;
}
}

View file

@ -0,0 +1,28 @@
package component.rpc;
import java.util.List;
import component.model.TreeItemDto;
import component.service.TreeItemService;
import ru.cg.webbpm.modules.webkit.annotations.RpcCall;
import ru.cg.webbpm.modules.webkit.annotations.RpcService;
import ru.cg.webbpm.modules.webkit.beans.Behavior;
/**
* @author r.latypov
*/
@RpcService
public class TreeItemRpcService extends Behavior {
public TreeItemService treeItemService;
@RpcCall
public List<TreeItemDto> loadTreeData() {
return treeItemService.loadTreeData();
}
@RpcCall
public List<TreeItemDto> loadTreeDataByDomainId(String domainId) {
return treeItemService.loadTreeDataByDomainId(domainId);
}
}

View file

@ -0,0 +1,126 @@
package component.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import component.model.TreeItemDto;
import component.rpc.TreeItemRpcService;
import database.dao.DefaultLoadDao;
import org.springframework.stereotype.Service;
import ru.cg.webbpm.modules.database.api.bean.TableRow;
import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions;
import ru.cg.webbpm.modules.database.bean.annotation.GraphSource;
import ru.cg.webbpm.modules.database.bean.annotation.TypedColumn;
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumnType;
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
/**
* @author r.latypov
*/
@Service
public class TreeItemService {
@NotNull
public DefaultLoadDao loadDao;
@GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
@NotNull
public EntityColumn idColumn;
@GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
@NotNull
public EntityColumn parentIdColumn;
@GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
@TypedColumn(colTypes = EntityColumnType.STRING)
@NotNull
public EntityColumn labelColumn;
@GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
public EntityColumn businessIdColumn;
@GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
public EntityColumn domainIdColumn;
public List<TreeItemDto> loadTreeData() {
List<TreeItemDto> loadedTreeItems = loadTreeItems();
loadedTreeItems.forEach(item -> item.domainId = null);
return loadedTreeItems.stream()
.filter(item -> item.parentId == null)
.toList();
}
public List<TreeItemDto> loadTreeDataByDomainId(String domainId) {
if (domainId == null || domainIdColumn == null) {
return loadTreeData();
}
List<TreeItemDto> filteredTreeItems = loadTreeItems().stream()
.filter(item -> item.domainId.equalsIgnoreCase(domainId))
.toList();
filteredTreeItems.forEach(this::setDomainIdToNull);
return filteredTreeItems;
}
private void setDomainIdToNull(TreeItemDto treeItem) {
treeItem.domainId = null;
TreeItemDto[] treeItemChildren = treeItem.children;
if (treeItemChildren != null && treeItemChildren.length > 0) {
for (TreeItemDto child : treeItemChildren) {
setDomainIdToNull(child);
}
}
}
private List<TreeItemDto> loadTreeItems() {
List<TreeItemDto> loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream()
.map(this::toTreeItemDto)
.toList();
Map<Object, List<TreeItemDto>> childrenMap = new HashMap<>();
loadedList.forEach(item -> {
Object parentId = item.parentId;
if (parentId != null) {
List<TreeItemDto> listFromMap = childrenMap.computeIfAbsent(parentId,
k -> new ArrayList<>()
);
listFromMap.add(item);
}
});
loadedList.forEach(item -> {
List<TreeItemDto> children = childrenMap.get(item.id);
if (children != null) {
item.children = children.toArray(new TreeItemDto[0]);
}
});
return loadedList;
}
private Set<EntityColumn> getColumns() {
Set<EntityColumn> columnSet = new HashSet<>();
columnSet.add(idColumn);
columnSet.add(parentIdColumn);
columnSet.add(labelColumn);
if (businessIdColumn != null) {
columnSet.add(businessIdColumn);
}
if (domainIdColumn != null) {
columnSet.add(domainIdColumn);
}
return columnSet;
}
private TreeItemDto toTreeItemDto(TableRow tableRow) {
TreeItemDto treeItemDto = new TreeItemDto(
tableRow.get(idColumn), tableRow.get(parentIdColumn), (String) tableRow.get(labelColumn)
);
if (businessIdColumn != null) {
treeItemDto.businessId = tableRow.get(businessIdColumn);
}
if (domainIdColumn != null) {
treeItemDto.domainId =(String) tableRow.get(domainIdColumn);
}
return treeItemDto;
}
}

View file

@ -9,17 +9,24 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
import java.util.Arrays;
import java.util.List;
@ -62,6 +69,16 @@ public class ErvuDashboard extends SchemaImpl {
*/
public final CitizenSpouse CITIZEN_SPOUSE = CitizenSpouse.CITIZEN_SPOUSE;
/**
* сведения о гражданстве РФ
*/
public final Citizenship CITIZENSHIP = Citizenship.CITIZENSHIP;
/**
* сведения об иностранном гражданстве
*/
public final CitizenshipForeign CITIZENSHIP_FOREIGN = CitizenshipForeign.CITIZENSHIP_FOREIGN;
/**
* The table <code>ervu_dashboard.databasechangelog</code>.
*/
@ -72,6 +89,12 @@ public class ErvuDashboard extends SchemaImpl {
*/
public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
/**
* сведения о гражданах, избранных депутатами/зарегистрированных кандидатами
* на участие в выборах
*/
public final Deputy DEPUTY = Deputy.DEPUTY;
/**
* сведения об инвалидности/недееспособности/ограниченной дееспособности
*/
@ -92,16 +115,31 @@ public class ErvuDashboard extends SchemaImpl {
*/
public final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES;
/**
* сведения о паспорте
*/
public final Passport PASSPORT = Passport.PASSPORT;
/**
* сведения об имуществе
*/
public final Property PROPERTY = Property.PROPERTY;
/**
* сведения об уголовном преследовании
*/
public final Prosecution PROSECUTION = Prosecution.PROSECUTION;
/**
* The table <code>ervu_dashboard.pub_recruitment</code>.
*/
public final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT;
/**
* сведения об уголовном преследовании и вынесенном приговоре
*/
public final Punishment PUNISHMENT = Punishment.PUNISHMENT;
/**
* The table <code>ervu_dashboard.recruitment</code>.
*/
@ -117,6 +155,11 @@ public class ErvuDashboard extends SchemaImpl {
*/
public final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES;
/**
* сведения об имуществе
*/
public final Work WORK = Work.WORK;
/**
* No further instances allowed
*/
@ -137,17 +180,24 @@ public class ErvuDashboard extends SchemaImpl {
CitizenChild.CITIZEN_CHILD,
CitizenGuardianship.CITIZEN_GUARDIANSHIP,
CitizenSpouse.CITIZEN_SPOUSE,
Citizenship.CITIZENSHIP,
CitizenshipForeign.CITIZENSHIP_FOREIGN,
Databasechangelog.DATABASECHANGELOG,
Databasechangeloglock.DATABASECHANGELOGLOCK,
Deputy.DEPUTY,
Disability.DISABILITY,
Disease.DISEASE,
DriversLicence.DRIVERS_LICENCE,
MedicalAuthorities.MEDICAL_AUTHORITIES,
Passport.PASSPORT,
Property.PROPERTY,
Prosecution.PROSECUTION,
PubRecruitment.PUB_RECRUITMENT,
Punishment.PUNISHMENT,
Recruitment.RECRUITMENT,
Subpoena.SUBPOENA,
TemporaryMeasures.TEMPORARY_MEASURES
TemporaryMeasures.TEMPORARY_MEASURES,
Work.WORK
);
}
}

View file

@ -8,30 +8,44 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenChildRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenGuardianshipRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenSpouseRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DatabasechangeloglockRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DisabilityRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DriversLicenceRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.MedicalAuthoritiesRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PassportRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubRecruitmentRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.SubpoenaRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.WorkRecord;
import org.jooq.TableField;
import org.jooq.UniqueKey;
@ -54,15 +68,22 @@ public class Keys {
public static final UniqueKey<CitizenChildRecord> PK_CITIZEN_CHILD = Internal.createUniqueKey(CitizenChild.CITIZEN_CHILD, DSL.name("pk_citizen_child"), new TableField[] { CitizenChild.CITIZEN_CHILD.CITIZEN_CHILD_ID }, true);
public static final UniqueKey<CitizenGuardianshipRecord> PK_CITIZEN_GUARDIANSHIP = Internal.createUniqueKey(CitizenGuardianship.CITIZEN_GUARDIANSHIP, DSL.name("pk_citizen_guardianship"), new TableField[] { CitizenGuardianship.CITIZEN_GUARDIANSHIP.CITIZEN_GUARDIANSHIP_ID }, true);
public static final UniqueKey<CitizenSpouseRecord> PK_CITIZEN_SPOUSE = Internal.createUniqueKey(CitizenSpouse.CITIZEN_SPOUSE, DSL.name("pk_citizen_spouse"), new TableField[] { CitizenSpouse.CITIZEN_SPOUSE.CITIZEN_SPOUSE_ID }, true);
public static final UniqueKey<CitizenshipRecord> PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true);
public static final UniqueKey<CitizenshipForeignRecord> PK_CITIZENSHIP_FOREIGN = Internal.createUniqueKey(CitizenshipForeign.CITIZENSHIP_FOREIGN, DSL.name("pk_citizenship_foreign"), new TableField[] { CitizenshipForeign.CITIZENSHIP_FOREIGN.CITIZENSHIP_FOREIGN_ID }, true);
public static final UniqueKey<DatabasechangeloglockRecord> DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true);
public static final UniqueKey<DeputyRecord> PK_DEPUTY = Internal.createUniqueKey(Deputy.DEPUTY, DSL.name("pk_deputy"), new TableField[] { Deputy.DEPUTY.DEPUTY_ID }, true);
public static final UniqueKey<DisabilityRecord> PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true);
public static final UniqueKey<DiseaseRecord> PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true);
public static final UniqueKey<DriversLicenceRecord> PK_DRIVERS_LICENCE = Internal.createUniqueKey(DriversLicence.DRIVERS_LICENCE, DSL.name("pk_drivers_licence"), new TableField[] { DriversLicence.DRIVERS_LICENCE.DRIVERS_LICENCE_ID }, true);
public static final UniqueKey<MedicalAuthoritiesRecord> PK_MEDICAL_AUTHORITIES = Internal.createUniqueKey(MedicalAuthorities.MEDICAL_AUTHORITIES, DSL.name("pk_medical_authorities"), new TableField[] { MedicalAuthorities.MEDICAL_AUTHORITIES.MEDICAL_AUTHORITIES_ID }, true);
public static final UniqueKey<PassportRecord> PK_PASSPORT = Internal.createUniqueKey(Passport.PASSPORT, DSL.name("pk_passport"), new TableField[] { Passport.PASSPORT.PASSPORT_ID }, true);
public static final UniqueKey<PropertyRecord> PK_PROPERTY = Internal.createUniqueKey(Property.PROPERTY, DSL.name("pk_property"), new TableField[] { Property.PROPERTY.PROPERTY_ID }, true);
public static final UniqueKey<ProsecutionRecord> PK_PROSECUTION = Internal.createUniqueKey(Prosecution.PROSECUTION, DSL.name("pk_prosecution"), new TableField[] { Prosecution.PROSECUTION.PROSECUTION_ID }, true);
public static final UniqueKey<PubRecruitmentRecord> PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true);
public static final UniqueKey<PubRecruitmentRecord> RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true);
public static final UniqueKey<PunishmentRecord> PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true);
public static final UniqueKey<RecruitmentRecord> RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true);
public static final UniqueKey<SubpoenaRecord> SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true);
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<WorkRecord> PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true);
}

View file

@ -8,17 +8,24 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
/**
@ -47,6 +54,16 @@ public class Tables {
*/
public static final CitizenSpouse CITIZEN_SPOUSE = CitizenSpouse.CITIZEN_SPOUSE;
/**
* сведения о гражданстве РФ
*/
public static final Citizenship CITIZENSHIP = Citizenship.CITIZENSHIP;
/**
* сведения об иностранном гражданстве
*/
public static final CitizenshipForeign CITIZENSHIP_FOREIGN = CitizenshipForeign.CITIZENSHIP_FOREIGN;
/**
* The table <code>ervu_dashboard.databasechangelog</code>.
*/
@ -57,6 +74,12 @@ public class Tables {
*/
public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
/**
* сведения о гражданах, избранных депутатами/зарегистрированных кандидатами
* на участие в выборах
*/
public static final Deputy DEPUTY = Deputy.DEPUTY;
/**
* сведения об инвалидности/недееспособности/ограниченной дееспособности
*/
@ -77,16 +100,31 @@ public class Tables {
*/
public static final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES;
/**
* сведения о паспорте
*/
public static final Passport PASSPORT = Passport.PASSPORT;
/**
* сведения об имуществе
*/
public static final Property PROPERTY = Property.PROPERTY;
/**
* сведения об уголовном преследовании
*/
public static final Prosecution PROSECUTION = Prosecution.PROSECUTION;
/**
* The table <code>ervu_dashboard.pub_recruitment</code>.
*/
public static final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT;
/**
* сведения об уголовном преследовании и вынесенном приговоре
*/
public static final Punishment PUNISHMENT = Punishment.PUNISHMENT;
/**
* The table <code>ervu_dashboard.recruitment</code>.
*/
@ -101,4 +139,9 @@ public class Tables {
* The table <code>ervu_dashboard.temporary_measures</code>.
*/
public static final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES;
/**
* сведения об имуществе
*/
public static final Work WORK = Work.WORK;
}

View file

@ -0,0 +1,281 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord;
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;
/**
* сведения о гражданстве РФ
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Citizenship extends TableImpl<CitizenshipRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.citizenship</code>
*/
public static final Citizenship CITIZENSHIP = new Citizenship();
/**
* The class holding records for this type
*/
@Override
public Class<CitizenshipRecord> getRecordType() {
return CitizenshipRecord.class;
}
/**
* The column <code>ervu_dashboard.citizenship.citizenship_id</code>.
*/
public final TableField<CitizenshipRecord, Long> CITIZENSHIP_ID = createField(DSL.name("citizenship_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.citizenship.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<CitizenshipRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.citizenship.acquiring_basis</code>.
* основание приобретения гражданства РФ
*/
public final TableField<CitizenshipRecord, String> ACQUIRING_BASIS = createField(DSL.name("acquiring_basis"), SQLDataType.CLOB, this, "основание приобретения гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.acquiring_number</code>.
* номер решения о приобретении гражданства РФ
*/
public final TableField<CitizenshipRecord, String> ACQUIRING_NUMBER = createField(DSL.name("acquiring_number"), SQLDataType.VARCHAR(20), this, "номер решения о приобретении гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.acquiring_date</code>. дата
* решения о приобретении гражданства РФ
*/
public final TableField<CitizenshipRecord, Date> ACQUIRING_DATE = createField(DSL.name("acquiring_date"), SQLDataType.DATE, this, "дата решения о приобретении гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.acquiring_authority</code>.
* наименование органа, принявшего решение о приобретении гражданства РФ
*/
public final TableField<CitizenshipRecord, String> ACQUIRING_AUTHORITY = createField(DSL.name("acquiring_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о приобретении гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.renunciation_basis</code>.
* основание выхода гражданства РФ
*/
public final TableField<CitizenshipRecord, String> RENUNCIATION_BASIS = createField(DSL.name("renunciation_basis"), SQLDataType.CLOB, this, "основание выхода гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.renunciation_number</code>.
* номер решения о выходе из гражданства РФ
*/
public final TableField<CitizenshipRecord, String> RENUNCIATION_NUMBER = createField(DSL.name("renunciation_number"), SQLDataType.VARCHAR(20), this, "номер решения о выходе из гражданства РФ");
/**
* The column <code>ervu_dashboard.citizenship.renunciation_date</code>.
* дата решения о выходе из гражданства РФ
*/
public final TableField<CitizenshipRecord, Date> RENUNCIATION_DATE = createField(DSL.name("renunciation_date"), SQLDataType.DATE, this, "дата решения о выходе из гражданства РФ");
/**
* The column
* <code>ervu_dashboard.citizenship.renunciation_authority</code>.
* наименование органа, принявшего решение о выходе из гражданства РФ
*/
public final TableField<CitizenshipRecord, String> RENUNCIATION_AUTHORITY = createField(DSL.name("renunciation_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о выходе из гражданства РФ");
private Citizenship(Name alias, Table<CitizenshipRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Citizenship(Name alias, Table<CitizenshipRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения о гражданстве РФ"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.citizenship</code> table reference
*/
public Citizenship(String alias) {
this(DSL.name(alias), CITIZENSHIP);
}
/**
* Create an aliased <code>ervu_dashboard.citizenship</code> table reference
*/
public Citizenship(Name alias) {
this(alias, CITIZENSHIP);
}
/**
* Create a <code>ervu_dashboard.citizenship</code> table reference
*/
public Citizenship() {
this(DSL.name("citizenship"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<CitizenshipRecord, Long> getIdentity() {
return (Identity<CitizenshipRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<CitizenshipRecord> getPrimaryKey() {
return Keys.PK_CITIZENSHIP;
}
@Override
public Citizenship as(String alias) {
return new Citizenship(DSL.name(alias), this);
}
@Override
public Citizenship as(Name alias) {
return new Citizenship(alias, this);
}
@Override
public Citizenship as(Table<?> alias) {
return new Citizenship(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Citizenship rename(String name) {
return new Citizenship(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Citizenship rename(Name name) {
return new Citizenship(name, null);
}
/**
* Rename this table
*/
@Override
public Citizenship rename(Table<?> name) {
return new Citizenship(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship where(Condition condition) {
return new Citizenship(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Citizenship where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Citizenship where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Citizenship where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Citizenship where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Citizenship whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,269 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord;
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;
/**
* сведения об иностранном гражданстве
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class CitizenshipForeign extends TableImpl<CitizenshipForeignRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.citizenship_foreign</code>
*/
public static final CitizenshipForeign CITIZENSHIP_FOREIGN = new CitizenshipForeign();
/**
* The class holding records for this type
*/
@Override
public Class<CitizenshipForeignRecord> getRecordType() {
return CitizenshipForeignRecord.class;
}
/**
* The column
* <code>ervu_dashboard.citizenship_foreign.citizenship_foreign_id</code>.
*/
public final TableField<CitizenshipForeignRecord, Long> CITIZENSHIP_FOREIGN_ID = createField(DSL.name("citizenship_foreign_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.citizenship_foreign.recruit_id</code>.
* ссылка на гражданина (citizen)
*/
public final TableField<CitizenshipForeignRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.citizenship_foreign.country_name</code>.
* наименование государства
*/
public final TableField<CitizenshipForeignRecord, String> COUNTRY_NAME = createField(DSL.name("country_name"), SQLDataType.VARCHAR(255), this, "наименование государства");
/**
* The column
* <code>ervu_dashboard.citizenship_foreign.residense_right_basis</code>.
* основание получения права на постоянное проживание
*/
public final TableField<CitizenshipForeignRecord, String> RESIDENSE_RIGHT_BASIS = createField(DSL.name("residense_right_basis"), SQLDataType.VARCHAR(255), this, "основание получения права на постоянное проживание");
/**
* The column
* <code>ervu_dashboard.citizenship_foreign.residense_right_date</code>.
* дата возникновения права на постоянное проживание
*/
public final TableField<CitizenshipForeignRecord, Date> RESIDENSE_RIGHT_DATE = createField(DSL.name("residense_right_date"), SQLDataType.DATE, this, "дата возникновения права на постоянное проживание");
/**
* The column
* <code>ervu_dashboard.citizenship_foreign.citizenship_basis</code>.
* основание получения иностранного гражданства
*/
public final TableField<CitizenshipForeignRecord, String> CITIZENSHIP_BASIS = createField(DSL.name("citizenship_basis"), SQLDataType.VARCHAR(255), this, "основание получения иностранного гражданства");
/**
* The column
* <code>ervu_dashboard.citizenship_foreign.citizenship_date</code>. дата
* получения иностранного гражданства
*/
public final TableField<CitizenshipForeignRecord, Date> CITIZENSHIP_DATE = createField(DSL.name("citizenship_date"), SQLDataType.DATE, this, "дата получения иностранного гражданства");
private CitizenshipForeign(Name alias, Table<CitizenshipForeignRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private CitizenshipForeign(Name alias, Table<CitizenshipForeignRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения об иностранном гражданстве"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.citizenship_foreign</code> table
* reference
*/
public CitizenshipForeign(String alias) {
this(DSL.name(alias), CITIZENSHIP_FOREIGN);
}
/**
* Create an aliased <code>ervu_dashboard.citizenship_foreign</code> table
* reference
*/
public CitizenshipForeign(Name alias) {
this(alias, CITIZENSHIP_FOREIGN);
}
/**
* Create a <code>ervu_dashboard.citizenship_foreign</code> table reference
*/
public CitizenshipForeign() {
this(DSL.name("citizenship_foreign"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<CitizenshipForeignRecord, Long> getIdentity() {
return (Identity<CitizenshipForeignRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<CitizenshipForeignRecord> getPrimaryKey() {
return Keys.PK_CITIZENSHIP_FOREIGN;
}
@Override
public CitizenshipForeign as(String alias) {
return new CitizenshipForeign(DSL.name(alias), this);
}
@Override
public CitizenshipForeign as(Name alias) {
return new CitizenshipForeign(alias, this);
}
@Override
public CitizenshipForeign as(Table<?> alias) {
return new CitizenshipForeign(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public CitizenshipForeign rename(String name) {
return new CitizenshipForeign(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public CitizenshipForeign rename(Name name) {
return new CitizenshipForeign(name, null);
}
/**
* Rename this table
*/
@Override
public CitizenshipForeign rename(Table<?> name) {
return new CitizenshipForeign(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign where(Condition condition) {
return new CitizenshipForeign(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public CitizenshipForeign where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public CitizenshipForeign where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public CitizenshipForeign where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public CitizenshipForeign where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public CitizenshipForeign whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,264 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord;
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;
/**
* сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на
* участие в выборах
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Deputy extends TableImpl<DeputyRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.deputy</code>
*/
public static final Deputy DEPUTY = new Deputy();
/**
* The class holding records for this type
*/
@Override
public Class<DeputyRecord> getRecordType() {
return DeputyRecord.class;
}
/**
* The column <code>ervu_dashboard.deputy.deputy_id</code>.
*/
public final TableField<DeputyRecord, Long> DEPUTY_ID = createField(DSL.name("deputy_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.deputy.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<DeputyRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.deputy.deputy</code>. является
* депутатом(true)/кандидатом на участие в выборах(false)
*/
public final TableField<DeputyRecord, Boolean> DEPUTY_ = createField(DSL.name("deputy"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "является депутатом(true)/кандидатом на участие в выборах(false)");
/**
* The column <code>ervu_dashboard.deputy.information</code>. сведения об
* избрании гражданина депутатом/сведения о регистрации кандидатом на
* выборах
*/
public final TableField<DeputyRecord, String> INFORMATION = createField(DSL.name("information"), SQLDataType.CLOB, this, "сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах");
/**
* The column <code>ervu_dashboard.deputy.end_date</code>. дата досрочного
* прекращения полномочий/снятия кандидатуры с выборов
*/
public final TableField<DeputyRecord, Date> END_DATE = createField(DSL.name("end_date"), SQLDataType.DATE, this, "дата досрочного прекращения полномочий/снятия кандидатуры с выборов");
/**
* The column <code>ervu_dashboard.deputy.period_office</code>. срок
* полномочий
*/
public final TableField<DeputyRecord, String> PERIOD_OFFICE = createField(DSL.name("period_office"), SQLDataType.VARCHAR(50), this, "срок полномочий");
/**
* The column <code>ervu_dashboard.deputy.cancellation_date</code>. дата
* аннулирования регистрации
*/
public final TableField<DeputyRecord, Date> CANCELLATION_DATE = createField(DSL.name("cancellation_date"), SQLDataType.DATE, this, "дата аннулирования регистрации");
private Deputy(Name alias, Table<DeputyRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Deputy(Name alias, Table<DeputyRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.deputy</code> table reference
*/
public Deputy(String alias) {
this(DSL.name(alias), DEPUTY);
}
/**
* Create an aliased <code>ervu_dashboard.deputy</code> table reference
*/
public Deputy(Name alias) {
this(alias, DEPUTY);
}
/**
* Create a <code>ervu_dashboard.deputy</code> table reference
*/
public Deputy() {
this(DSL.name("deputy"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<DeputyRecord, Long> getIdentity() {
return (Identity<DeputyRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<DeputyRecord> getPrimaryKey() {
return Keys.PK_DEPUTY;
}
@Override
public Deputy as(String alias) {
return new Deputy(DSL.name(alias), this);
}
@Override
public Deputy as(Name alias) {
return new Deputy(alias, this);
}
@Override
public Deputy as(Table<?> alias) {
return new Deputy(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Deputy rename(String name) {
return new Deputy(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Deputy rename(Name name) {
return new Deputy(name, null);
}
/**
* Rename this table
*/
@Override
public Deputy rename(Table<?> name) {
return new Deputy(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy where(Condition condition) {
return new Deputy(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Deputy where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Deputy where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Deputy where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Deputy where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Deputy whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,268 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PassportRecord;
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;
/**
* сведения о паспорте
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Passport extends TableImpl<PassportRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.passport</code>
*/
public static final Passport PASSPORT = new Passport();
/**
* The class holding records for this type
*/
@Override
public Class<PassportRecord> getRecordType() {
return PassportRecord.class;
}
/**
* The column <code>ervu_dashboard.passport.passport_id</code>.
*/
public final TableField<PassportRecord, Long> PASSPORT_ID = createField(DSL.name("passport_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.passport.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<PassportRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.passport.actual</code>. статус документа:
* действительный(true)/недействительный(false)
*/
public final TableField<PassportRecord, Boolean> ACTUAL = createField(DSL.name("actual"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "статус документа: действительный(true)/недействительный(false)");
/**
* The column <code>ervu_dashboard.passport.passport_series</code>. серия
* паспорта
*/
public final TableField<PassportRecord, String> PASSPORT_SERIES = createField(DSL.name("passport_series"), SQLDataType.VARCHAR(4), this, "серия паспорта");
/**
* The column <code>ervu_dashboard.passport.passport_number</code>. номер
* паспорта
*/
public final TableField<PassportRecord, String> PASSPORT_NUMBER = createField(DSL.name("passport_number"), SQLDataType.VARCHAR(6), this, "номер паспорта");
/**
* The column <code>ervu_dashboard.passport.issue_date</code>. дата выдачи
* документа
*/
public final TableField<PassportRecord, Date> ISSUE_DATE = createField(DSL.name("issue_date"), SQLDataType.DATE, this, "дата выдачи документа");
/**
* The column <code>ervu_dashboard.passport.organization_name</code>.
* наименование органа, выдавшего документ
*/
public final TableField<PassportRecord, String> ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(255), this, "наименование органа, выдавшего документ");
/**
* The column <code>ervu_dashboard.passport.unit_code</code>. код
* подразделения
*/
public final TableField<PassportRecord, String> UNIT_CODE = createField(DSL.name("unit_code"), SQLDataType.VARCHAR(7), this, "код подразделения");
private Passport(Name alias, Table<PassportRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Passport(Name alias, Table<PassportRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения о паспорте"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.passport</code> table reference
*/
public Passport(String alias) {
this(DSL.name(alias), PASSPORT);
}
/**
* Create an aliased <code>ervu_dashboard.passport</code> table reference
*/
public Passport(Name alias) {
this(alias, PASSPORT);
}
/**
* Create a <code>ervu_dashboard.passport</code> table reference
*/
public Passport() {
this(DSL.name("passport"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<PassportRecord, Long> getIdentity() {
return (Identity<PassportRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<PassportRecord> getPrimaryKey() {
return Keys.PK_PASSPORT;
}
@Override
public Passport as(String alias) {
return new Passport(DSL.name(alias), this);
}
@Override
public Passport as(Name alias) {
return new Passport(alias, this);
}
@Override
public Passport as(Table<?> alias) {
return new Passport(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Passport rename(String name) {
return new Passport(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Passport rename(Name name) {
return new Passport(name, null);
}
/**
* Rename this table
*/
@Override
public Passport rename(Table<?> name) {
return new Passport(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport where(Condition condition) {
return new Passport(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Passport where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Passport where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Passport where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Passport where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Passport whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,292 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord;
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;
/**
* сведения об уголовном преследовании
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Prosecution extends TableImpl<ProsecutionRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.prosecution</code>
*/
public static final Prosecution PROSECUTION = new Prosecution();
/**
* The class holding records for this type
*/
@Override
public Class<ProsecutionRecord> getRecordType() {
return ProsecutionRecord.class;
}
/**
* The column <code>ervu_dashboard.prosecution.prosecution_id</code>.
*/
public final TableField<ProsecutionRecord, Long> PROSECUTION_ID = createField(DSL.name("prosecution_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.prosecution.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<ProsecutionRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.prosecution.kind</code>. вид уголовного
* преследования
*/
public final TableField<ProsecutionRecord, String> KIND = createField(DSL.name("kind"), SQLDataType.VARCHAR(255), this, "вид уголовного преследования");
/**
* The column <code>ervu_dashboard.prosecution.create_date</code>. дата
* возбуждения уголовного дела
*/
public final TableField<ProsecutionRecord, Date> CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.DATE, this, "дата возбуждения уголовного дела");
/**
* The column <code>ervu_dashboard.prosecution.close_date</code>. дата
* прекращения уголовного преследования
*/
public final TableField<ProsecutionRecord, Date> CLOSE_DATE = createField(DSL.name("close_date"), SQLDataType.DATE, this, "дата прекращения уголовного преследования");
/**
* The column <code>ervu_dashboard.prosecution.authority_name</code>.
* наименование органа, принявшего решение
*/
public final TableField<ProsecutionRecord, String> AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование органа, принявшего решение");
/**
* The column <code>ervu_dashboard.prosecution.law_point</code>. пункт,
* часть, статья УК РФ
*/
public final TableField<ProsecutionRecord, String> LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ");
/**
* The column <code>ervu_dashboard.prosecution.termination_basis</code>.
* основание прекращения уголовного преследования
*/
public final TableField<ProsecutionRecord, String> TERMINATION_BASIS = createField(DSL.name("termination_basis"), SQLDataType.VARCHAR(255), this, "основание прекращения уголовного преследования");
/**
* The column <code>ervu_dashboard.prosecution.transfer_to_court</code>.
* признак передачи в суд уголовного дела в отношении гражданина
*/
public final TableField<ProsecutionRecord, Boolean> TRANSFER_TO_COURT = createField(DSL.name("transfer_to_court"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак передачи в суд уголовного дела в отношении гражданина");
/**
* The column <code>ervu_dashboard.prosecution.case_number</code>. номер
* уголовного дела (предварительный)
*/
public final TableField<ProsecutionRecord, String> CASE_NUMBER = createField(DSL.name("case_number"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (предварительный)");
/**
* The column <code>ervu_dashboard.prosecution.case_number_court</code>.
* номер уголовного дела (судебный)
*/
public final TableField<ProsecutionRecord, String> CASE_NUMBER_COURT = createField(DSL.name("case_number_court"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (судебный)");
/**
* The column <code>ervu_dashboard.prosecution.reclassification</code>.
* сведения о переквалификации деяния
*/
public final TableField<ProsecutionRecord, String> RECLASSIFICATION = createField(DSL.name("reclassification"), SQLDataType.CLOB, this, "сведения о переквалификации деяния");
private Prosecution(Name alias, Table<ProsecutionRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Prosecution(Name alias, Table<ProsecutionRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.prosecution</code> table reference
*/
public Prosecution(String alias) {
this(DSL.name(alias), PROSECUTION);
}
/**
* Create an aliased <code>ervu_dashboard.prosecution</code> table reference
*/
public Prosecution(Name alias) {
this(alias, PROSECUTION);
}
/**
* Create a <code>ervu_dashboard.prosecution</code> table reference
*/
public Prosecution() {
this(DSL.name("prosecution"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<ProsecutionRecord, Long> getIdentity() {
return (Identity<ProsecutionRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<ProsecutionRecord> getPrimaryKey() {
return Keys.PK_PROSECUTION;
}
@Override
public Prosecution as(String alias) {
return new Prosecution(DSL.name(alias), this);
}
@Override
public Prosecution as(Name alias) {
return new Prosecution(alias, this);
}
@Override
public Prosecution as(Table<?> alias) {
return new Prosecution(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Prosecution rename(String name) {
return new Prosecution(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Prosecution rename(Name name) {
return new Prosecution(name, null);
}
/**
* Rename this table
*/
@Override
public Prosecution rename(Table<?> name) {
return new Prosecution(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution where(Condition condition) {
return new Prosecution(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Prosecution where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Prosecution where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Prosecution where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Prosecution where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Prosecution whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,310 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord;
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;
/**
* сведения об уголовном преследовании и вынесенном приговоре
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Punishment extends TableImpl<PunishmentRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.punishment</code>
*/
public static final Punishment PUNISHMENT = new Punishment();
/**
* The class holding records for this type
*/
@Override
public Class<PunishmentRecord> getRecordType() {
return PunishmentRecord.class;
}
/**
* The column <code>ervu_dashboard.punishment.punishment_id</code>.
*/
public final TableField<PunishmentRecord, Long> PUNISHMENT_ID = createField(DSL.name("punishment_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.punishment.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<PunishmentRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.punishment.sentence</code>. срок или
* размер наказания
*/
public final TableField<PunishmentRecord, String> SENTENCE = createField(DSL.name("sentence"), SQLDataType.VARCHAR(255), this, "срок или размер наказания");
/**
* The column <code>ervu_dashboard.punishment.sentence_changed</code>.
* изменение срока или размера наказания
*/
public final TableField<PunishmentRecord, String> SENTENCE_CHANGED = createField(DSL.name("sentence_changed"), SQLDataType.VARCHAR(255), this, "изменение срока или размера наказания");
/**
* The column <code>ervu_dashboard.punishment.sentense_date</code>. дата
* вынесения обвинительного приговора
*/
public final TableField<PunishmentRecord, Date> SENTENSE_DATE = createField(DSL.name("sentense_date"), SQLDataType.DATE, this, "дата вынесения обвинительного приговора");
/**
* The column <code>ervu_dashboard.punishment.authority_name</code>.
* наименование суда, вынесшего приговор
*/
public final TableField<PunishmentRecord, String> AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование суда, вынесшего приговор");
/**
* The column <code>ervu_dashboard.punishment.law_point</code>. пункт,
* часть, статья УК РФ
*/
public final TableField<PunishmentRecord, String> LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ");
/**
* The column <code>ervu_dashboard.punishment.punishment_type</code>. вид
* наказания
*/
public final TableField<PunishmentRecord, String> PUNISHMENT_TYPE = createField(DSL.name("punishment_type"), SQLDataType.VARCHAR(100), this, "вид наказания");
/**
* The column <code>ervu_dashboard.punishment.punishment_code</code>. код
* вида наказания
*/
public final TableField<PunishmentRecord, String> PUNISHMENT_CODE = createField(DSL.name("punishment_code"), SQLDataType.VARCHAR(5), this, "код вида наказания");
/**
* The column <code>ervu_dashboard.punishment.sentence_place</code>.
* наименование и адрес места отбывания наказания
*/
public final TableField<PunishmentRecord, String> SENTENCE_PLACE = createField(DSL.name("sentence_place"), SQLDataType.CLOB, this, "наименование и адрес места отбывания наказания");
/**
* The column <code>ervu_dashboard.punishment.start_date</code>. дата начала
* срока отбывания наказания
*/
public final TableField<PunishmentRecord, Date> START_DATE = createField(DSL.name("start_date"), SQLDataType.DATE, this, "дата начала срока отбывания наказания");
/**
* The column <code>ervu_dashboard.punishment.planned_date</code>. плановая
* дата отбытия
*/
public final TableField<PunishmentRecord, Date> PLANNED_DATE = createField(DSL.name("planned_date"), SQLDataType.DATE, this, "плановая дата отбытия");
/**
* The column <code>ervu_dashboard.punishment.release_date</code>. дата
* освобождения
*/
public final TableField<PunishmentRecord, Date> RELEASE_DATE = createField(DSL.name("release_date"), SQLDataType.DATE, this, "дата освобождения");
/**
* The column <code>ervu_dashboard.punishment.release_reason</code>.
* основание освобождения
*/
public final TableField<PunishmentRecord, String> RELEASE_REASON = createField(DSL.name("release_reason"), SQLDataType.VARCHAR(255), this, "основание освобождения");
/**
* The column <code>ervu_dashboard.punishment.mandatory_work</code>. признак
* отбывания наказания в виде обязательных работ
*/
public final TableField<PunishmentRecord, Boolean> MANDATORY_WORK = createField(DSL.name("mandatory_work"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак отбывания наказания в виде обязательных работ");
private Punishment(Name alias, Table<PunishmentRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Punishment(Name alias, Table<PunishmentRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании и вынесенном приговоре"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.punishment</code> table reference
*/
public Punishment(String alias) {
this(DSL.name(alias), PUNISHMENT);
}
/**
* Create an aliased <code>ervu_dashboard.punishment</code> table reference
*/
public Punishment(Name alias) {
this(alias, PUNISHMENT);
}
/**
* Create a <code>ervu_dashboard.punishment</code> table reference
*/
public Punishment() {
this(DSL.name("punishment"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<PunishmentRecord, Long> getIdentity() {
return (Identity<PunishmentRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<PunishmentRecord> getPrimaryKey() {
return Keys.PK_PUNISHMENT;
}
@Override
public Punishment as(String alias) {
return new Punishment(DSL.name(alias), this);
}
@Override
public Punishment as(Name alias) {
return new Punishment(alias, this);
}
@Override
public Punishment as(Table<?> alias) {
return new Punishment(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Punishment rename(String name) {
return new Punishment(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Punishment rename(Name name) {
return new Punishment(name, null);
}
/**
* Rename this table
*/
@Override
public Punishment rename(Table<?> name) {
return new Punishment(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment where(Condition condition) {
return new Punishment(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Punishment where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Punishment where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Punishment where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Punishment where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Punishment whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -9,7 +9,6 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord;
import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.AppearSubppoena.AppearSubppoenaPath;
import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.ConscriptionInfo.ConscriptionInfoPath;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.Appeals.AppealsPath;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.PostponementInfo.PostponementInfoPath;
import java.util.Collection;
@ -189,19 +188,6 @@ public class Recruitment extends TableImpl<RecruitmentRecord> {
return _conscriptionInfo;
}
private transient AppealsPath _appeals;
/**
* Get the implicit to-many join path to the
* <code>recruitment_campaign.appeals</code> table
*/
public AppealsPath appeals() {
if (_appeals == null)
_appeals = new AppealsPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.Keys.APPEALS__RC_APPEALS_FK1.getInverseKey());
return _appeals;
}
private transient PostponementInfoPath _postponementInfo;
/**

View file

@ -0,0 +1,282 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.WorkRecord;
import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.EmployerCategoryType;
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;
/**
* сведения об имуществе
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Work extends TableImpl<WorkRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>ervu_dashboard.work</code>
*/
public static final Work WORK = new Work();
/**
* The class holding records for this type
*/
@Override
public Class<WorkRecord> getRecordType() {
return WorkRecord.class;
}
/**
* The column <code>ervu_dashboard.work.work_id</code>.
*/
public final TableField<WorkRecord, Long> WORK_ID = createField(DSL.name("work_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>ervu_dashboard.work.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public final TableField<WorkRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)");
/**
* The column <code>ervu_dashboard.work.employer_category</code>. категория
* работодателя: юр лицо/ИП/физ лицо/глава КФХ
*/
public final TableField<WorkRecord, EmployerCategoryType> EMPLOYER_CATEGORY = createField(DSL.name("employer_category"), SQLDataType.VARCHAR.asEnumDataType(EmployerCategoryType.class), this, "категория работодателя: юр лицо/ИП/физ лицо/глава КФХ");
/**
* The column <code>ervu_dashboard.work.place</code>. место работы
*/
public final TableField<WorkRecord, String> PLACE = createField(DSL.name("place"), SQLDataType.CLOB, this, "место работы");
/**
* The column <code>ervu_dashboard.work.organization_name</code>.
* наименование организации
*/
public final TableField<WorkRecord, String> ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(100), this, "наименование организации");
/**
* The column <code>ervu_dashboard.work.inn</code>. ИНН
*/
public final TableField<WorkRecord, String> INN = createField(DSL.name("inn"), SQLDataType.VARCHAR(15), this, "ИНН");
/**
* The column <code>ervu_dashboard.work.kpp</code>. КПП
*/
public final TableField<WorkRecord, String> KPP = createField(DSL.name("kpp"), SQLDataType.VARCHAR(15), this, "КПП");
/**
* The column <code>ervu_dashboard.work.ogrnip</code>. ОГРНИП
*/
public final TableField<WorkRecord, String> OGRNIP = createField(DSL.name("ogrnip"), SQLDataType.VARCHAR(20), this, "ОГРНИП");
/**
* The column <code>ervu_dashboard.work.position</code>. должность
*/
public final TableField<WorkRecord, String> POSITION = createField(DSL.name("position"), SQLDataType.VARCHAR(150), this, "должность");
/**
* The column <code>ervu_dashboard.work.event_type</code>. тип кадрового
* мероприятия
*/
public final TableField<WorkRecord, String> EVENT_TYPE = createField(DSL.name("event_type"), SQLDataType.VARCHAR(50), this, "тип кадрового мероприятия ");
/**
* The column <code>ervu_dashboard.work.event_date</code>. дата кадрового
* мероприятия
*/
public final TableField<WorkRecord, Date> EVENT_DATE = createField(DSL.name("event_date"), SQLDataType.DATE, this, "дата кадрового мероприятия");
private Work(Name alias, Table<WorkRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Work(Name alias, Table<WorkRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment("сведения об имуществе"), TableOptions.table(), where);
}
/**
* Create an aliased <code>ervu_dashboard.work</code> table reference
*/
public Work(String alias) {
this(DSL.name(alias), WORK);
}
/**
* Create an aliased <code>ervu_dashboard.work</code> table reference
*/
public Work(Name alias) {
this(alias, WORK);
}
/**
* Create a <code>ervu_dashboard.work</code> table reference
*/
public Work() {
this(DSL.name("work"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
}
@Override
public Identity<WorkRecord, Long> getIdentity() {
return (Identity<WorkRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<WorkRecord> getPrimaryKey() {
return Keys.PK_WORK;
}
@Override
public Work as(String alias) {
return new Work(DSL.name(alias), this);
}
@Override
public Work as(Name alias) {
return new Work(alias, this);
}
@Override
public Work as(Table<?> alias) {
return new Work(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Work rename(String name) {
return new Work(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Work rename(Name name) {
return new Work(name, null);
}
/**
* Rename this table
*/
@Override
public Work rename(Table<?> name) {
return new Work(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Work where(Condition condition) {
return new Work(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Work where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Work where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Work where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Work where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Work where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Work where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Work where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Work whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Work whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

View file

@ -0,0 +1,179 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения об иностранном гражданстве
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class CitizenshipForeignRecord extends UpdatableRecordImpl<CitizenshipForeignRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_foreign_id</code>.
*/
public void setCitizenshipForeignId(Long value) {
set(0, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_foreign_id</code>.
*/
public Long getCitizenshipForeignId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.citizenship_foreign.recruit_id</code>.
* ссылка на гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship_foreign.recruit_id</code>.
* ссылка на гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.citizenship_foreign.country_name</code>.
* наименование государства
*/
public void setCountryName(String value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship_foreign.country_name</code>.
* наименование государства
*/
public String getCountryName() {
return (String) get(2);
}
/**
* Setter for
* <code>ervu_dashboard.citizenship_foreign.residense_right_basis</code>.
* основание получения права на постоянное проживание
*/
public void setResidenseRightBasis(String value) {
set(3, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship_foreign.residense_right_basis</code>.
* основание получения права на постоянное проживание
*/
public String getResidenseRightBasis() {
return (String) get(3);
}
/**
* Setter for
* <code>ervu_dashboard.citizenship_foreign.residense_right_date</code>.
* дата возникновения права на постоянное проживание
*/
public void setResidenseRightDate(Date value) {
set(4, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship_foreign.residense_right_date</code>.
* дата возникновения права на постоянное проживание
*/
public Date getResidenseRightDate() {
return (Date) get(4);
}
/**
* Setter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_basis</code>.
* основание получения иностранного гражданства
*/
public void setCitizenshipBasis(String value) {
set(5, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_basis</code>.
* основание получения иностранного гражданства
*/
public String getCitizenshipBasis() {
return (String) get(5);
}
/**
* Setter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_date</code>. дата
* получения иностранного гражданства
*/
public void setCitizenshipDate(Date value) {
set(6, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship_foreign.citizenship_date</code>. дата
* получения иностранного гражданства
*/
public Date getCitizenshipDate() {
return (Date) get(6);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached CitizenshipForeignRecord
*/
public CitizenshipForeignRecord() {
super(CitizenshipForeign.CITIZENSHIP_FOREIGN);
}
/**
* Create a detached, initialised CitizenshipForeignRecord
*/
public CitizenshipForeignRecord(Long citizenshipForeignId, UUID recruitId, String countryName, String residenseRightBasis, Date residenseRightDate, String citizenshipBasis, Date citizenshipDate) {
super(CitizenshipForeign.CITIZENSHIP_FOREIGN);
setCitizenshipForeignId(citizenshipForeignId);
setRecruitId(recruitId);
setCountryName(countryName);
setResidenseRightBasis(residenseRightBasis);
setResidenseRightDate(residenseRightDate);
setCitizenshipBasis(citizenshipBasis);
setCitizenshipDate(citizenshipDate);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,222 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения о гражданстве РФ
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class CitizenshipRecord extends UpdatableRecordImpl<CitizenshipRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.citizenship.citizenship_id</code>.
*/
public void setCitizenshipId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.citizenship_id</code>.
*/
public Long getCitizenshipId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.citizenship.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.citizenship.acquiring_basis</code>.
* основание приобретения гражданства РФ
*/
public void setAcquiringBasis(String value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.acquiring_basis</code>.
* основание приобретения гражданства РФ
*/
public String getAcquiringBasis() {
return (String) get(2);
}
/**
* Setter for <code>ervu_dashboard.citizenship.acquiring_number</code>.
* номер решения о приобретении гражданства РФ
*/
public void setAcquiringNumber(String value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.acquiring_number</code>.
* номер решения о приобретении гражданства РФ
*/
public String getAcquiringNumber() {
return (String) get(3);
}
/**
* Setter for <code>ervu_dashboard.citizenship.acquiring_date</code>. дата
* решения о приобретении гражданства РФ
*/
public void setAcquiringDate(Date value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.acquiring_date</code>. дата
* решения о приобретении гражданства РФ
*/
public Date getAcquiringDate() {
return (Date) get(4);
}
/**
* Setter for <code>ervu_dashboard.citizenship.acquiring_authority</code>.
* наименование органа, принявшего решение о приобретении гражданства РФ
*/
public void setAcquiringAuthority(String value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.acquiring_authority</code>.
* наименование органа, принявшего решение о приобретении гражданства РФ
*/
public String getAcquiringAuthority() {
return (String) get(5);
}
/**
* Setter for <code>ervu_dashboard.citizenship.renunciation_basis</code>.
* основание выхода гражданства РФ
*/
public void setRenunciationBasis(String value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.renunciation_basis</code>.
* основание выхода гражданства РФ
*/
public String getRenunciationBasis() {
return (String) get(6);
}
/**
* Setter for <code>ervu_dashboard.citizenship.renunciation_number</code>.
* номер решения о выходе из гражданства РФ
*/
public void setRenunciationNumber(String value) {
set(7, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.renunciation_number</code>.
* номер решения о выходе из гражданства РФ
*/
public String getRenunciationNumber() {
return (String) get(7);
}
/**
* Setter for <code>ervu_dashboard.citizenship.renunciation_date</code>.
* дата решения о выходе из гражданства РФ
*/
public void setRenunciationDate(Date value) {
set(8, value);
}
/**
* Getter for <code>ervu_dashboard.citizenship.renunciation_date</code>.
* дата решения о выходе из гражданства РФ
*/
public Date getRenunciationDate() {
return (Date) get(8);
}
/**
* Setter for
* <code>ervu_dashboard.citizenship.renunciation_authority</code>.
* наименование органа, принявшего решение о выходе из гражданства РФ
*/
public void setRenunciationAuthority(String value) {
set(9, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizenship.renunciation_authority</code>.
* наименование органа, принявшего решение о выходе из гражданства РФ
*/
public String getRenunciationAuthority() {
return (String) get(9);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached CitizenshipRecord
*/
public CitizenshipRecord() {
super(Citizenship.CITIZENSHIP);
}
/**
* Create a detached, initialised CitizenshipRecord
*/
public CitizenshipRecord(Long citizenshipId, UUID recruitId, String acquiringBasis, String acquiringNumber, Date acquiringDate, String acquiringAuthority, String renunciationBasis, String renunciationNumber, Date renunciationDate, String renunciationAuthority) {
super(Citizenship.CITIZENSHIP);
setCitizenshipId(citizenshipId);
setRecruitId(recruitId);
setAcquiringBasis(acquiringBasis);
setAcquiringNumber(acquiringNumber);
setAcquiringDate(acquiringDate);
setAcquiringAuthority(acquiringAuthority);
setRenunciationBasis(renunciationBasis);
setRenunciationNumber(renunciationNumber);
setRenunciationDate(renunciationDate);
setRenunciationAuthority(renunciationAuthority);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,172 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на
* участие в выборах
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class DeputyRecord extends UpdatableRecordImpl<DeputyRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.deputy.deputy_id</code>.
*/
public void setDeputyId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.deputy_id</code>.
*/
public Long getDeputyId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.deputy.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.deputy.deputy</code>. является
* депутатом(true)/кандидатом на участие в выборах(false)
*/
public void setDeputy(Boolean value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.deputy</code>. является
* депутатом(true)/кандидатом на участие в выборах(false)
*/
public Boolean getDeputy() {
return (Boolean) get(2);
}
/**
* Setter for <code>ervu_dashboard.deputy.information</code>. сведения об
* избрании гражданина депутатом/сведения о регистрации кандидатом на
* выборах
*/
public void setInformation(String value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.information</code>. сведения об
* избрании гражданина депутатом/сведения о регистрации кандидатом на
* выборах
*/
public String getInformation() {
return (String) get(3);
}
/**
* Setter for <code>ervu_dashboard.deputy.end_date</code>. дата досрочного
* прекращения полномочий/снятия кандидатуры с выборов
*/
public void setEndDate(Date value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.end_date</code>. дата досрочного
* прекращения полномочий/снятия кандидатуры с выборов
*/
public Date getEndDate() {
return (Date) get(4);
}
/**
* Setter for <code>ervu_dashboard.deputy.period_office</code>. срок
* полномочий
*/
public void setPeriodOffice(String value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.period_office</code>. срок
* полномочий
*/
public String getPeriodOffice() {
return (String) get(5);
}
/**
* Setter for <code>ervu_dashboard.deputy.cancellation_date</code>. дата
* аннулирования регистрации
*/
public void setCancellationDate(Date value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.deputy.cancellation_date</code>. дата
* аннулирования регистрации
*/
public Date getCancellationDate() {
return (Date) get(6);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached DeputyRecord
*/
public DeputyRecord() {
super(Deputy.DEPUTY);
}
/**
* Create a detached, initialised DeputyRecord
*/
public DeputyRecord(Long deputyId, UUID recruitId, Boolean deputy, String information, Date endDate, String periodOffice, Date cancellationDate) {
super(Deputy.DEPUTY);
setDeputyId(deputyId);
setRecruitId(recruitId);
setDeputy(deputy);
setInformation(information);
setEndDate(endDate);
setPeriodOffice(periodOffice);
setCancellationDate(cancellationDate);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,186 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения о паспорте
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PassportRecord extends UpdatableRecordImpl<PassportRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.passport.passport_id</code>.
*/
public void setPassportId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.passport.passport_id</code>.
*/
public Long getPassportId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.passport.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.passport.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.passport.actual</code>. статус документа:
* действительный(true)/недействительный(false)
*/
public void setActual(Boolean value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.passport.actual</code>. статус документа:
* действительный(true)/недействительный(false)
*/
public Boolean getActual() {
return (Boolean) get(2);
}
/**
* Setter for <code>ervu_dashboard.passport.passport_series</code>. серия
* паспорта
*/
public void setPassportSeries(String value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.passport.passport_series</code>. серия
* паспорта
*/
public String getPassportSeries() {
return (String) get(3);
}
/**
* Setter for <code>ervu_dashboard.passport.passport_number</code>. номер
* паспорта
*/
public void setPassportNumber(String value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.passport.passport_number</code>. номер
* паспорта
*/
public String getPassportNumber() {
return (String) get(4);
}
/**
* Setter for <code>ervu_dashboard.passport.issue_date</code>. дата выдачи
* документа
*/
public void setIssueDate(Date value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.passport.issue_date</code>. дата выдачи
* документа
*/
public Date getIssueDate() {
return (Date) get(5);
}
/**
* Setter for <code>ervu_dashboard.passport.organization_name</code>.
* наименование органа, выдавшего документ
*/
public void setOrganizationName(String value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.passport.organization_name</code>.
* наименование органа, выдавшего документ
*/
public String getOrganizationName() {
return (String) get(6);
}
/**
* Setter for <code>ervu_dashboard.passport.unit_code</code>. код
* подразделения
*/
public void setUnitCode(String value) {
set(7, value);
}
/**
* Getter for <code>ervu_dashboard.passport.unit_code</code>. код
* подразделения
*/
public String getUnitCode() {
return (String) get(7);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached PassportRecord
*/
public PassportRecord() {
super(Passport.PASSPORT);
}
/**
* Create a detached, initialised PassportRecord
*/
public PassportRecord(Long passportId, UUID recruitId, Boolean actual, String passportSeries, String passportNumber, Date issueDate, String organizationName, String unitCode) {
super(Passport.PASSPORT);
setPassportId(passportId);
setRecruitId(recruitId);
setActual(actual);
setPassportSeries(passportSeries);
setPassportNumber(passportNumber);
setIssueDate(issueDate);
setOrganizationName(organizationName);
setUnitCode(unitCode);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,254 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения об уголовном преследовании
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class ProsecutionRecord extends UpdatableRecordImpl<ProsecutionRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.prosecution.prosecution_id</code>.
*/
public void setProsecutionId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.prosecution_id</code>.
*/
public Long getProsecutionId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.prosecution.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.prosecution.kind</code>. вид уголовного
* преследования
*/
public void setKind(String value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.kind</code>. вид уголовного
* преследования
*/
public String getKind() {
return (String) get(2);
}
/**
* Setter for <code>ervu_dashboard.prosecution.create_date</code>. дата
* возбуждения уголовного дела
*/
public void setCreateDate(Date value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.create_date</code>. дата
* возбуждения уголовного дела
*/
public Date getCreateDate() {
return (Date) get(3);
}
/**
* Setter for <code>ervu_dashboard.prosecution.close_date</code>. дата
* прекращения уголовного преследования
*/
public void setCloseDate(Date value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.close_date</code>. дата
* прекращения уголовного преследования
*/
public Date getCloseDate() {
return (Date) get(4);
}
/**
* Setter for <code>ervu_dashboard.prosecution.authority_name</code>.
* наименование органа, принявшего решение
*/
public void setAuthorityName(String value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.authority_name</code>.
* наименование органа, принявшего решение
*/
public String getAuthorityName() {
return (String) get(5);
}
/**
* Setter for <code>ervu_dashboard.prosecution.law_point</code>. пункт,
* часть, статья УК РФ
*/
public void setLawPoint(String value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.law_point</code>. пункт,
* часть, статья УК РФ
*/
public String getLawPoint() {
return (String) get(6);
}
/**
* Setter for <code>ervu_dashboard.prosecution.termination_basis</code>.
* основание прекращения уголовного преследования
*/
public void setTerminationBasis(String value) {
set(7, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.termination_basis</code>.
* основание прекращения уголовного преследования
*/
public String getTerminationBasis() {
return (String) get(7);
}
/**
* Setter for <code>ervu_dashboard.prosecution.transfer_to_court</code>.
* признак передачи в суд уголовного дела в отношении гражданина
*/
public void setTransferToCourt(Boolean value) {
set(8, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.transfer_to_court</code>.
* признак передачи в суд уголовного дела в отношении гражданина
*/
public Boolean getTransferToCourt() {
return (Boolean) get(8);
}
/**
* Setter for <code>ervu_dashboard.prosecution.case_number</code>. номер
* уголовного дела (предварительный)
*/
public void setCaseNumber(String value) {
set(9, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.case_number</code>. номер
* уголовного дела (предварительный)
*/
public String getCaseNumber() {
return (String) get(9);
}
/**
* Setter for <code>ervu_dashboard.prosecution.case_number_court</code>.
* номер уголовного дела (судебный)
*/
public void setCaseNumberCourt(String value) {
set(10, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.case_number_court</code>.
* номер уголовного дела (судебный)
*/
public String getCaseNumberCourt() {
return (String) get(10);
}
/**
* Setter for <code>ervu_dashboard.prosecution.reclassification</code>.
* сведения о переквалификации деяния
*/
public void setReclassification(String value) {
set(11, value);
}
/**
* Getter for <code>ervu_dashboard.prosecution.reclassification</code>.
* сведения о переквалификации деяния
*/
public String getReclassification() {
return (String) get(11);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached ProsecutionRecord
*/
public ProsecutionRecord() {
super(Prosecution.PROSECUTION);
}
/**
* Create a detached, initialised ProsecutionRecord
*/
public ProsecutionRecord(Long prosecutionId, UUID recruitId, String kind, Date createDate, Date closeDate, String authorityName, String lawPoint, String terminationBasis, Boolean transferToCourt, String caseNumber, String caseNumberCourt, String reclassification) {
super(Prosecution.PROSECUTION);
setProsecutionId(prosecutionId);
setRecruitId(recruitId);
setKind(kind);
setCreateDate(createDate);
setCloseDate(closeDate);
setAuthorityName(authorityName);
setLawPoint(lawPoint);
setTerminationBasis(terminationBasis);
setTransferToCourt(transferToCourt);
setCaseNumber(caseNumber);
setCaseNumberCourt(caseNumberCourt);
setReclassification(reclassification);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,305 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения об уголовном преследовании и вынесенном приговоре
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PunishmentRecord extends UpdatableRecordImpl<PunishmentRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.punishment.punishment_id</code>.
*/
public void setPunishmentId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.punishment_id</code>.
*/
public Long getPunishmentId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.punishment.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.punishment.sentence</code>. срок или
* размер наказания
*/
public void setSentence(String value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.sentence</code>. срок или
* размер наказания
*/
public String getSentence() {
return (String) get(2);
}
/**
* Setter for <code>ervu_dashboard.punishment.sentence_changed</code>.
* изменение срока или размера наказания
*/
public void setSentenceChanged(String value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.sentence_changed</code>.
* изменение срока или размера наказания
*/
public String getSentenceChanged() {
return (String) get(3);
}
/**
* Setter for <code>ervu_dashboard.punishment.sentense_date</code>. дата
* вынесения обвинительного приговора
*/
public void setSentenseDate(Date value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.sentense_date</code>. дата
* вынесения обвинительного приговора
*/
public Date getSentenseDate() {
return (Date) get(4);
}
/**
* Setter for <code>ervu_dashboard.punishment.authority_name</code>.
* наименование суда, вынесшего приговор
*/
public void setAuthorityName(String value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.authority_name</code>.
* наименование суда, вынесшего приговор
*/
public String getAuthorityName() {
return (String) get(5);
}
/**
* Setter for <code>ervu_dashboard.punishment.law_point</code>. пункт,
* часть, статья УК РФ
*/
public void setLawPoint(String value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.law_point</code>. пункт,
* часть, статья УК РФ
*/
public String getLawPoint() {
return (String) get(6);
}
/**
* Setter for <code>ervu_dashboard.punishment.punishment_type</code>. вид
* наказания
*/
public void setPunishmentType(String value) {
set(7, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.punishment_type</code>. вид
* наказания
*/
public String getPunishmentType() {
return (String) get(7);
}
/**
* Setter for <code>ervu_dashboard.punishment.punishment_code</code>. код
* вида наказания
*/
public void setPunishmentCode(String value) {
set(8, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.punishment_code</code>. код
* вида наказания
*/
public String getPunishmentCode() {
return (String) get(8);
}
/**
* Setter for <code>ervu_dashboard.punishment.sentence_place</code>.
* наименование и адрес места отбывания наказания
*/
public void setSentencePlace(String value) {
set(9, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.sentence_place</code>.
* наименование и адрес места отбывания наказания
*/
public String getSentencePlace() {
return (String) get(9);
}
/**
* Setter for <code>ervu_dashboard.punishment.start_date</code>. дата начала
* срока отбывания наказания
*/
public void setStartDate(Date value) {
set(10, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.start_date</code>. дата начала
* срока отбывания наказания
*/
public Date getStartDate() {
return (Date) get(10);
}
/**
* Setter for <code>ervu_dashboard.punishment.planned_date</code>. плановая
* дата отбытия
*/
public void setPlannedDate(Date value) {
set(11, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.planned_date</code>. плановая
* дата отбытия
*/
public Date getPlannedDate() {
return (Date) get(11);
}
/**
* Setter for <code>ervu_dashboard.punishment.release_date</code>. дата
* освобождения
*/
public void setReleaseDate(Date value) {
set(12, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.release_date</code>. дата
* освобождения
*/
public Date getReleaseDate() {
return (Date) get(12);
}
/**
* Setter for <code>ervu_dashboard.punishment.release_reason</code>.
* основание освобождения
*/
public void setReleaseReason(String value) {
set(13, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.release_reason</code>.
* основание освобождения
*/
public String getReleaseReason() {
return (String) get(13);
}
/**
* Setter for <code>ervu_dashboard.punishment.mandatory_work</code>. признак
* отбывания наказания в виде обязательных работ
*/
public void setMandatoryWork(Boolean value) {
set(14, value);
}
/**
* Getter for <code>ervu_dashboard.punishment.mandatory_work</code>. признак
* отбывания наказания в виде обязательных работ
*/
public Boolean getMandatoryWork() {
return (Boolean) get(14);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached PunishmentRecord
*/
public PunishmentRecord() {
super(Punishment.PUNISHMENT);
}
/**
* Create a detached, initialised PunishmentRecord
*/
public PunishmentRecord(Long punishmentId, UUID recruitId, String sentence, String sentenceChanged, Date sentenseDate, String authorityName, String lawPoint, String punishmentType, String punishmentCode, String sentencePlace, Date startDate, Date plannedDate, Date releaseDate, String releaseReason, Boolean mandatoryWork) {
super(Punishment.PUNISHMENT);
setPunishmentId(punishmentId);
setRecruitId(recruitId);
setSentence(sentence);
setSentenceChanged(sentenceChanged);
setSentenseDate(sentenseDate);
setAuthorityName(authorityName);
setLawPoint(lawPoint);
setPunishmentType(punishmentType);
setPunishmentCode(punishmentCode);
setSentencePlace(sentencePlace);
setStartDate(startDate);
setPlannedDate(plannedDate);
setReleaseDate(releaseDate);
setReleaseReason(releaseReason);
setMandatoryWork(mandatoryWork);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,228 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work;
import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.EmployerCategoryType;
import java.sql.Date;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* сведения об имуществе
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class WorkRecord extends UpdatableRecordImpl<WorkRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>ervu_dashboard.work.work_id</code>.
*/
public void setWorkId(Long value) {
set(0, value);
}
/**
* Getter for <code>ervu_dashboard.work.work_id</code>.
*/
public Long getWorkId() {
return (Long) get(0);
}
/**
* Setter for <code>ervu_dashboard.work.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public void setRecruitId(UUID value) {
set(1, value);
}
/**
* Getter for <code>ervu_dashboard.work.recruit_id</code>. ссылка на
* гражданина (citizen)
*/
public UUID getRecruitId() {
return (UUID) get(1);
}
/**
* Setter for <code>ervu_dashboard.work.employer_category</code>. категория
* работодателя: юр лицо/ИП/физ лицо/глава КФХ
*/
public void setEmployerCategory(EmployerCategoryType value) {
set(2, value);
}
/**
* Getter for <code>ervu_dashboard.work.employer_category</code>. категория
* работодателя: юр лицо/ИП/физ лицо/глава КФХ
*/
public EmployerCategoryType getEmployerCategory() {
return (EmployerCategoryType) get(2);
}
/**
* Setter for <code>ervu_dashboard.work.place</code>. место работы
*/
public void setPlace(String value) {
set(3, value);
}
/**
* Getter for <code>ervu_dashboard.work.place</code>. место работы
*/
public String getPlace() {
return (String) get(3);
}
/**
* Setter for <code>ervu_dashboard.work.organization_name</code>.
* наименование организации
*/
public void setOrganizationName(String value) {
set(4, value);
}
/**
* Getter for <code>ervu_dashboard.work.organization_name</code>.
* наименование организации
*/
public String getOrganizationName() {
return (String) get(4);
}
/**
* Setter for <code>ervu_dashboard.work.inn</code>. ИНН
*/
public void setInn(String value) {
set(5, value);
}
/**
* Getter for <code>ervu_dashboard.work.inn</code>. ИНН
*/
public String getInn() {
return (String) get(5);
}
/**
* Setter for <code>ervu_dashboard.work.kpp</code>. КПП
*/
public void setKpp(String value) {
set(6, value);
}
/**
* Getter for <code>ervu_dashboard.work.kpp</code>. КПП
*/
public String getKpp() {
return (String) get(6);
}
/**
* Setter for <code>ervu_dashboard.work.ogrnip</code>. ОГРНИП
*/
public void setOgrnip(String value) {
set(7, value);
}
/**
* Getter for <code>ervu_dashboard.work.ogrnip</code>. ОГРНИП
*/
public String getOgrnip() {
return (String) get(7);
}
/**
* Setter for <code>ervu_dashboard.work.position</code>. должность
*/
public void setPosition(String value) {
set(8, value);
}
/**
* Getter for <code>ervu_dashboard.work.position</code>. должность
*/
public String getPosition() {
return (String) get(8);
}
/**
* Setter for <code>ervu_dashboard.work.event_type</code>. тип кадрового
* мероприятия
*/
public void setEventType(String value) {
set(9, value);
}
/**
* Getter for <code>ervu_dashboard.work.event_type</code>. тип кадрового
* мероприятия
*/
public String getEventType() {
return (String) get(9);
}
/**
* Setter for <code>ervu_dashboard.work.event_date</code>. дата кадрового
* мероприятия
*/
public void setEventDate(Date value) {
set(10, value);
}
/**
* Getter for <code>ervu_dashboard.work.event_date</code>. дата кадрового
* мероприятия
*/
public Date getEventDate() {
return (Date) get(10);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached WorkRecord
*/
public WorkRecord() {
super(Work.WORK);
}
/**
* Create a detached, initialised WorkRecord
*/
public WorkRecord(Long workId, UUID recruitId, EmployerCategoryType employerCategory, String place, String organizationName, String inn, String kpp, String ogrnip, String position, String eventType, Date eventDate) {
super(Work.WORK);
setWorkId(workId);
setRecruitId(recruitId);
setEmployerCategory(employerCategory);
setPlace(place);
setOrganizationName(organizationName);
setInn(inn);
setKpp(kpp);
setOgrnip(ogrnip);
setPosition(position);
setEventType(eventType);
setEventDate(eventDate);
resetChangedOnNotNull();
}
}

View file

@ -0,0 +1,62 @@
/*
* This file is generated by jOOQ.
*/
package ervu_dashboard.ervu_dashboard.db_beans.public_.enums;
import ervu_dashboard.ervu_dashboard.db_beans.public_.Public;
import org.jooq.Catalog;
import org.jooq.EnumType;
import org.jooq.Schema;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public enum EmployerCategoryType implements EnumType {
fl("fl"),
ul("ul"),
kfh("kfh"),
ip("ip");
private final String literal;
private EmployerCategoryType(String literal) {
this.literal = literal;
}
@Override
public Catalog getCatalog() {
return getSchema().getCatalog();
}
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
@Override
public String getName() {
return "employer_category_type";
}
@Override
public String getLiteral() {
return literal;
}
/**
* Lookup a value of this EnumType by its literal. Returns
* <code>null</code>, if no such value could be found, see {@link
* EnumType#lookupLiteral(Class, String)}.
*/
public static EmployerCategoryType lookupLiteral(String literal) {
return EnumType.lookupLiteral(EmployerCategoryType.class, literal);
}
}

View file

@ -31,7 +31,7 @@ public class Keys {
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<AppealsRecord> PK_APPEAL = Internal.createUniqueKey(Appeals.APPEALS, DSL.name("pk_appeal"), new TableField[] { Appeals.APPEALS.ID_APPEAL }, true);
public static final UniqueKey<AppealsRecord> APPEALS_PKEY = Internal.createUniqueKey(Appeals.APPEALS, DSL.name("appeals_pkey"), new TableField[] { Appeals.APPEALS.RECORDING_DATE, Appeals.APPEALS.SPRING_AUTUMN, Appeals.APPEALS.RECRUITMENT_ID }, true);
public static final UniqueKey<PostponementInfoRecord> PK_POSTPONEMENT_INFO = Internal.createUniqueKey(PostponementInfo.POSTPONEMENT_INFO, DSL.name("pk_postponement_info"), new TableField[] { PostponementInfo.POSTPONEMENT_INFO.POSTPONEMENT_INFO_ID }, true);
public static final UniqueKey<SubpoenasRecord> SUBPOENAS_PKEY = Internal.createUniqueKey(Subpoenas.SUBPOENAS, DSL.name("subpoenas_pkey"), new TableField[] { Subpoenas.SUBPOENAS.SPRING_AUTUMN, Subpoenas.SUBPOENAS.RECRUITMENT_ID, Subpoenas.SUBPOENAS.RECORDING_DATE }, true);
@ -39,6 +39,5 @@ public class Keys {
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
public static final ForeignKey<AppealsRecord, RecruitmentRecord> APPEALS__RC_APPEALS_FK1 = Internal.createForeignKey(Appeals.APPEALS, DSL.name("rc_appeals_fk1"), new TableField[] { Appeals.APPEALS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true);
public static final ForeignKey<PostponementInfoRecord, RecruitmentRecord> POSTPONEMENT_INFO__POSTPONEMENT_INFO_FK1 = Internal.createForeignKey(PostponementInfo.POSTPONEMENT_INFO, DSL.name("postponement_info_fk1"), new TableField[] { PostponementInfo.POSTPONEMENT_INFO.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true);
}

View file

@ -4,27 +4,19 @@
package ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables;
import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment.RecruitmentPath;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.Keys;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.RecruitmentCampaign;
import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.records.AppealsRecord;
import java.math.BigDecimal;
import java.sql.Date;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -60,15 +52,10 @@ public class Appeals extends TableImpl<AppealsRecord> {
}
/**
* The column <code>recruitment_campaign.appeals.id_appeal</code>.
*/
public final TableField<AppealsRecord, Long> ID_APPEAL = createField(DSL.name("id_appeal"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>recruitment_campaign.appeals.total_appeal</code>.
* The column <code>recruitment_campaign.appeals.total_appeals</code>.
* Получено жалоб
*/
public final TableField<AppealsRecord, BigDecimal> TOTAL_APPEAL = createField(DSL.name("total_appeal"), SQLDataType.NUMERIC, this, "Получено жалоб");
public final TableField<AppealsRecord, BigDecimal> TOTAL_APPEALS = createField(DSL.name("total_appeals"), SQLDataType.NUMERIC, this, "Получено жалоб");
/**
* The column <code>recruitment_campaign.appeals.resolved</code>. Решено
@ -98,7 +85,7 @@ public class Appeals extends TableImpl<AppealsRecord> {
* The column <code>recruitment_campaign.appeals.recording_date</code>. Дата
* записи
*/
public final TableField<AppealsRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи");
public final TableField<AppealsRecord, Date> RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи");
/**
* The column <code>recruitment_campaign.appeals.resolved_percent</code>.
@ -116,12 +103,12 @@ public class Appeals extends TableImpl<AppealsRecord> {
/**
* The column <code>recruitment_campaign.appeals.recruitment_id</code>.
*/
public final TableField<AppealsRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, "");
public final TableField<AppealsRecord, String> RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, "");
/**
* The column <code>recruitment_campaign.appeals.testspring_autumn</code>.
* The column <code>recruitment_campaign.appeals.spring_autumn</code>.
*/
public final TableField<AppealsRecord, String> TESTSPRING_AUTUMN = createField(DSL.name("testspring_autumn"), SQLDataType.CHAR(36), this, "");
public final TableField<AppealsRecord, String> SPRING_AUTUMN = createField(DSL.name("spring_autumn"), SQLDataType.VARCHAR.nullable(false), this, "");
private Appeals(Name alias, Table<AppealsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -154,68 +141,14 @@ public class Appeals extends TableImpl<AppealsRecord> {
this(DSL.name("appeals"), null);
}
public <O extends Record> Appeals(Table<O> path, ForeignKey<O, AppealsRecord> childPath, InverseForeignKey<O, AppealsRecord> parentPath) {
super(path, childPath, parentPath, APPEALS);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class AppealsPath extends Appeals implements Path<AppealsRecord> {
public <O extends Record> AppealsPath(Table<O> path, ForeignKey<O, AppealsRecord> childPath, InverseForeignKey<O, AppealsRecord> parentPath) {
super(path, childPath, parentPath);
}
private AppealsPath(Name alias, Table<AppealsRecord> aliased) {
super(alias, aliased);
}
@Override
public AppealsPath as(String alias) {
return new AppealsPath(DSL.name(alias), this);
}
@Override
public AppealsPath as(Name alias) {
return new AppealsPath(alias, this);
}
@Override
public AppealsPath as(Table<?> alias) {
return new AppealsPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : RecruitmentCampaign.RECRUITMENT_CAMPAIGN;
}
@Override
public Identity<AppealsRecord, Long> getIdentity() {
return (Identity<AppealsRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<AppealsRecord> getPrimaryKey() {
return Keys.PK_APPEAL;
}
@Override
public List<ForeignKey<AppealsRecord, ?>> getReferences() {
return Arrays.asList(Keys.APPEALS__RC_APPEALS_FK1);
}
private transient RecruitmentPath _recruitment;
/**
* Get the implicit join path to the <code>ervu_dashboard.recruitment</code>
* table.
*/
public RecruitmentPath recruitment() {
if (_recruitment == null)
_recruitment = new RecruitmentPath(this, Keys.APPEALS__RC_APPEALS_FK1, null);
return _recruitment;
return Keys.APPEALS_PKEY;
}
@Override

View file

@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.Appeal
import java.math.BigDecimal;
import java.sql.Date;
import org.jooq.Record1;
import org.jooq.Record3;
import org.jooq.impl.UpdatableRecordImpl;
@ -22,47 +22,33 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>recruitment_campaign.appeals.id_appeal</code>.
* Setter for <code>recruitment_campaign.appeals.total_appeals</code>.
* Получено жалоб
*/
public void setIdAppeal(Long value) {
public void setTotalAppeals(BigDecimal value) {
set(0, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.id_appeal</code>.
*/
public Long getIdAppeal() {
return (Long) get(0);
}
/**
* Setter for <code>recruitment_campaign.appeals.total_appeal</code>.
* Getter for <code>recruitment_campaign.appeals.total_appeals</code>.
* Получено жалоб
*/
public void setTotalAppeal(BigDecimal value) {
set(1, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.total_appeal</code>.
* Получено жалоб
*/
public BigDecimal getTotalAppeal() {
return (BigDecimal) get(1);
public BigDecimal getTotalAppeals() {
return (BigDecimal) get(0);
}
/**
* Setter for <code>recruitment_campaign.appeals.resolved</code>. Решено
*/
public void setResolved(BigDecimal value) {
set(2, value);
set(1, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.resolved</code>. Решено
*/
public BigDecimal getResolved() {
return (BigDecimal) get(2);
return (BigDecimal) get(1);
}
/**
@ -70,7 +56,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* решено
*/
public void setNotResolved(BigDecimal value) {
set(3, value);
set(2, value);
}
/**
@ -78,7 +64,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* решено
*/
public BigDecimal getNotResolved() {
return (BigDecimal) get(3);
return (BigDecimal) get(2);
}
/**
@ -87,7 +73,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* решения
*/
public void setAverageConsideration(BigDecimal value) {
set(4, value);
set(3, value);
}
/**
@ -96,7 +82,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* решения
*/
public BigDecimal getAverageConsideration() {
return (BigDecimal) get(4);
return (BigDecimal) get(3);
}
/**
@ -104,7 +90,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* Оценка удовлетворенности
*/
public void setAverageRating(BigDecimal value) {
set(5, value);
set(4, value);
}
/**
@ -112,7 +98,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* Оценка удовлетворенности
*/
public BigDecimal getAverageRating() {
return (BigDecimal) get(5);
return (BigDecimal) get(4);
}
/**
@ -120,7 +106,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* записи
*/
public void setRecordingDate(Date value) {
set(6, value);
set(5, value);
}
/**
@ -128,7 +114,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* записи
*/
public Date getRecordingDate() {
return (Date) get(6);
return (Date) get(5);
}
/**
@ -136,7 +122,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* Процент решенных
*/
public void setResolvedPercent(BigDecimal value) {
set(7, value);
set(6, value);
}
/**
@ -144,7 +130,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* Процент решенных
*/
public BigDecimal getResolvedPercent() {
return (BigDecimal) get(7);
return (BigDecimal) get(6);
}
/**
@ -153,7 +139,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* не решенных
*/
public void setNotResolvedPercent(BigDecimal value) {
set(8, value);
set(7, value);
}
/**
@ -162,44 +148,44 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
* не решенных
*/
public BigDecimal getNotResolvedPercent() {
return (BigDecimal) get(8);
return (BigDecimal) get(7);
}
/**
* Setter for <code>recruitment_campaign.appeals.recruitment_id</code>.
*/
public void setRecruitmentId(String value) {
set(9, value);
set(8, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.recruitment_id</code>.
*/
public String getRecruitmentId() {
return (String) get(8);
}
/**
* Setter for <code>recruitment_campaign.appeals.spring_autumn</code>.
*/
public void setSpringAutumn(String value) {
set(9, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.spring_autumn</code>.
*/
public String getSpringAutumn() {
return (String) get(9);
}
/**
* Setter for <code>recruitment_campaign.appeals.testspring_autumn</code>.
*/
public void setTestspringAutumn(String value) {
set(10, value);
}
/**
* Getter for <code>recruitment_campaign.appeals.testspring_autumn</code>.
*/
public String getTestspringAutumn() {
return (String) get(10);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
public Record3<Date, String, String> key() {
return (Record3) super.key();
}
// -------------------------------------------------------------------------
@ -216,11 +202,10 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
/**
* Create a detached, initialised AppealsRecord
*/
public AppealsRecord(Long idAppeal, BigDecimal totalAppeal, BigDecimal resolved, BigDecimal notResolved, BigDecimal averageConsideration, BigDecimal averageRating, Date recordingDate, BigDecimal resolvedPercent, BigDecimal notResolvedPercent, String recruitmentId, String testspringAutumn) {
public AppealsRecord(BigDecimal totalAppeals, BigDecimal resolved, BigDecimal notResolved, BigDecimal averageConsideration, BigDecimal averageRating, Date recordingDate, BigDecimal resolvedPercent, BigDecimal notResolvedPercent, String recruitmentId, String springAutumn) {
super(Appeals.APPEALS);
setIdAppeal(idAppeal);
setTotalAppeal(totalAppeal);
setTotalAppeals(totalAppeals);
setResolved(resolved);
setNotResolved(notResolved);
setAverageConsideration(averageConsideration);
@ -229,7 +214,7 @@ public class AppealsRecord extends UpdatableRecordImpl<AppealsRecord> {
setResolvedPercent(resolvedPercent);
setNotResolvedPercent(notResolvedPercent);
setRecruitmentId(recruitmentId);
setTestspringAutumn(testspringAutumn);
setSpringAutumn(springAutumn);
resetChangedOnNotNull();
}
}

View file

@ -4,6 +4,37 @@
padding-right: var(--indent-mini);
}
.webbpm.ervu_dashboard check-box label {
width: min-content !important;
margin: 0 !important;
}
.webbpm.ervu_dashboard check-box label span {
content: "";
position: absolute;
top: 0;
left: 0;
width: min(1.4vw, 1.75rem); /*28*/
height: min(1.4vw, 1.75rem); /*28*/
padding: 2px;
margin: 0;
border-radius: 4px;
background-color: var(--color-dark-20);
}
.webbpm.ervu_dashboard check-box label input {
position: absolute;
z-index: -1;
opacity: 0;
}
.webbpm.ervu_dashboard check-box.wb-not-empty label span {
content: url('../img/svg/mark.svg');
border: 1px solid var(--color-success);
background-color: var(--color-primary-5);
}
.webbpm.ervu_dashboard check-box + text {
color: var(--color-text-secondary);
margin-left: var(--indent-large) !important;
}
.webbpm.ervu_dashboard .bread-crumb .form-group {
margin-bottom: 0;
}
@ -62,8 +93,10 @@
font-size: var(--size-text-secondary);
top: 50%;
transform: translateY(-50%);
margin-left: var(--indent-small);
margin-left: var(--indent-small);
}
/* temp list */
.webbpm.ervu_dashboard .top-btn-block .selectize-control {
font-size: inherit;
background-color: transparent;
@ -112,6 +145,135 @@
.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .selectize-dropdown-content {
background: var(--color-dark-20);
}
/* temp list */
.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button,
.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button:is(:focus, :active) {
color: var(--color-text-primary);
font-size: var(--size-text-primary);
padding: var(--indent-mini) var(--indent-huge) var(--indent-mini) var(--indent-xbase);
margin: 0;
border-radius: 100px;
border: 0;
background: var(--color-dark-20);
box-shadow: none !important;
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown.show > button {
background-color: var(--color-success);
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button::after {
position: absolute;
content: "\f282";
color: var(--color-text-primary);
font-family: bootstrap-icons !important;
font-weight: 800 !important;
font-size: var(--size-text-secondary);
top: calc(50% - (var(--size-text-secondary) + var(--indent-xmini)) / 2);
right: var(--indent-base);
margin: 0;
border: 0;
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown.show > button::after {
top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2);
transform: rotate(180deg);
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu {
padding: 0;
border-radius: var(--indent-xbase);
border: 1px solid var(--color-text-secondary);
background: var(--color-dark-20);
backdrop-filter: var(--bg-blur-40);
box-shadow: var(--bg-shadow);
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu :is(.dropdown-container, .treeview-container) {
padding: 0;
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container {
margin-bottom: var(--indent-base);
overflow-y: auto;
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header .row-filter {
margin: var(--indent-base) var(--indent-xbase);
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header .row-filter > div {
padding: 0;
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input {
color: var(--black);
font-size: var(--size-text-primary);
width: 100%;
padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase);
border: 0;
border-radius: 24px;
background-color: var(--color-text-secondary);
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input::-webkit-input-placeholder {
color: var(--black);
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input:-moz-placeholder {
color: var(--black);
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input::-moz-placeholder {
color: var(--black);
}
.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input:-ms-input-placeholder {
color: var(--black);
}
.webbpm.ervu_dashboard dropdown-tree-view .row-filter {
position: relative;
}
.webbpm.ervu_dashboard dropdown-tree-view .row-filter::after {
content: "\f52a";
position: absolute;
color: var(--color-dark);
font-family: bootstrap-icons !important;
font-weight: 800 !important;
font-size: var(--size-text-secondary);
top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2);
right: var(--indent-xbase);
}
.webbpm.ervu_dashboard dropdown-tree-view .dropdown-divider {
margin: 0;
border-color: var(--color-primary-5);
}
.webbpm.ervu_dashboard dropdown-tree-view :is(.row-item, .treeview-text) {
color: var(--color-text-primary);
padding: var(--indent-base) var(--indent-xbase);
border-bottom: 1px solid var(--color-primary-5);
}
.webbpm.ervu_dashboard dropdown-tree-view .row-item:is(:hover, :focus, :active) {
color: var(--color-success);
}
.webbpm.ervu_dashboard dropdown-tree-view ngx-treeview-item ngx-treeview-item .treeview-item {
padding-left: var(--indent-xbase);
}
.webbpm.ervu_dashboard dropdown-tree-view .row-item label {
font-size: var(--size-text-primary);
width: auto;
min-width: min(7.5vw, 9.375rem); /*150*/
}
.webbpm.ervu_dashboard dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill) {
margin-right: var(--indent-mini);
}
.webbpm.ervu_dashboard dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill)::before {
position: relative;
top: calc(var(--indent-xmini) / -4);
font-size: var(--size-text-secondary);
}
.webbpm.ervu_dashboard dropdown-tree-view .bi-caret-down-fill::before {
content: "\f2e9";
}
.webbpm.ervu_dashboard dropdown-tree-view .bi-caret-right-fill::before {
content: "\f4fd";
}
/*
.webbpm.ervu_dashboard ngx-treeview-item > .treeview-item > div > ngx-treeview-item > .treeview-item:hover {
background-color: cyan;
}
*/
.webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn) .btn {
position: relative;
@ -696,35 +858,7 @@
padding: 0;
margin: 0 0 var(--indent-mini) var(--indent-small);
}
.webbpm.ervu_dashboard .search-block .child-block check-box label {
width: min-content;
}
.webbpm.ervu_dashboard .search-block .child-block check-box label span {
content: "";
position: absolute;
top: 0;
left: 0;
width: min(1.4vw, 1.75rem); /*28*/
height: min(1.4vw, 1.75rem); /*28*/
padding: 2px;
margin: 0;
border-radius: 4px;
background-color: var(--color-dark-20);
}
.webbpm.ervu_dashboard .search-block .child-block check-box label input {
position: absolute;
z-index: -1;
opacity: 0;
}
.webbpm.ervu_dashboard .search-block .child-block check-box.wb-valid.wb-not-empty label span {
content: url('../img/svg/mark.svg');
border: 1px solid var(--color-success);
background-color: var(--color-primary-5);
}
.webbpm.ervu_dashboard .search-block .child-block check-box + text {
color: var(--color-text-secondary);
margin-left: var(--indent-base) !important;
}
.webbpm.ervu_dashboard .search-block .child-block :is(.title, .nav-tabs, text) {
margin-left: var(--indent-small);
}
@ -879,9 +1013,6 @@
.webbpm.ervu_dashboard .search-block .selectize-input::before {
display: none;
}
.webbpm.ervu_dashboard .search-block check-box label > span {
width: auto;
}
.webbpm.ervu_dashboard .search-block .grid {
flex-direction: column;
flex: 1 1 auto;
@ -1097,6 +1228,10 @@
display: none !important;
}
.webbpm.ervu_dashboard grid-v2 + .subtitle {
margin-top: var(--indent-medium);
}
/* Special pages */
.webbpm.ervu_dashboard #total_registered_second .child-block:nth-child(1) {
flex: 0;
@ -1362,3 +1497,26 @@
width: 100% !important;
}
}
/*
grid-checkbox
.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox {
width: 16px;
height: 16px;
border-radius: 4px;
background-color: var(--color-dark-20);
}
.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox {
content: url(../img/svg/mark.svg);
border: 1px solid var(--color-success);
background-color: var(--color-primary-5);
}
.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox > input {
position: absolute;
z-index: -1;
opacity: 0;
}
*/

View file

@ -0,0 +1,9 @@
label {
margin-bottom: 0;
cursor: pointer;
}
.bi {
cursor: pointer;
margin-right: 0.3rem;
}

View file

@ -0,0 +1,22 @@
.dropdown {
width: 100%;
display: inline-block;
button {
width: 100%;
margin-right: 0.9rem;
text-align: left;
overflow: hidden;
padding-right: 30px;
text-overflow: ellipsis;
&::after {
position: absolute;
right: 0.6rem;
margin-top: 0.6rem;
}
}
.dropdown-menu {
.dropdown-container {
padding: 0 0.6rem;
}
}
}

View file

@ -0,0 +1,9 @@
:host {
display: block;
.treeview-item {
white-space: nowrap;
.treeview-item {
margin-left: 2rem;
}
}
}

View file

@ -0,0 +1,32 @@
:host {
.treeview-header {
.row-filter {
margin-bottom: 0.5rem;
}
.row-all {
.bi {
cursor: pointer;
}
}
}
.treeview-container {
.row-item {
margin-bottom: 0.3rem;
flex-wrap: nowrap;
.bi {
cursor: pointer;
margin-right: 0.3rem;
}
}
}
}
.treeview-container {
overflow-y: auto;
padding-right: 0.3rem;
}
.treeview-text {
padding: 0.3rem 0;
white-space: nowrap;
}

View file

@ -30,7 +30,8 @@
--color-success: #00db5d;
--color-error: #f91e11;
--color-dark: #070e1a;
--color-dark-20: rgba(7, 14, 26, 0.2);
--color-dark-20: rgba(7, 14, 26, 0.2);
--color-dark-40: rgba(7, 14, 26, 0.4);
--color-tooltip: rgba(8, 40, 59, 0.8);
--btn-border: #00f0ff;

View file

@ -7,4 +7,8 @@
@import "../../../node_modules/@webbpm/base-package/css/style.css";
@import "structure.css";
@import "inbox-dashboard.css";
@import "components-dashboard.css";
@import "components-dashboard.css";
@import "external/ngx-treeview/dropdown-treeview.component.scss";
@import "external/ngx-treeview/dropdown-treeview-select.component.scss";
@import "external/ngx-treeview/treeview.component.scss";
@import "external/ngx-treeview/treeview-item.component.scss";

View file

@ -0,0 +1,61 @@
<ng-template #itemTemplate let-item="item" let-onCollapseExpand="onCollapseExpand"
let-onCheckedChange="onCheckedChange">
<div class="text-nowrap row-item">
<i *ngIf="item.children"
(click)="onCollapseExpand()"
aria-hidden="true"
[ngSwitch]="item.collapsed">
<i *ngSwitchCase="true" class="bi bi-caret-right-fill"></i>
<i *ngSwitchCase="false" class="bi bi-caret-down-fill"></i>
</i>
<label class="form-check-label" (click)="select(item)">{{ item.text }}</label>
</div>
</ng-template>
<ng-template #headerTemplate let-config="config" let-item="item"
let-onCollapseExpand="onCollapseExpand" let-onCheckedChange="onCheckedChange"
let-onFilterTextChange="onFilterTextChange">
<div *ngIf="config.hasFilter" class="row row-filter">
<div class="col-12">
<input class="form-control" type="text"
[placeholder]="i18n.getFilterPlaceholder()"
[(ngModel)]="filterText"
(ngModelChange)="onFilterTextChange($event)" />
</div>
</div>
<div *ngIf="config.hasAllCheckBox || config.hasCollapseExpand" class="row">
<div class="col-12">
<label *ngIf="config.hasAllCheckBox" (click)="select(item)">
<strong>{{ i18n.getAllCheckboxText() }}</strong>
</label>
<label *ngIf="config.hasCollapseExpand" class="float-right" (click)="onCollapseExpand()">
<i [title]="i18n.getTooltipCollapseExpandText(item.collapsed)" aria-hidden="true" [ngSwitch]="item.collapsed">
<svg *ngSwitchCase="true" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-expand"
fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M1.5 10.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
<path fill-rule="evenodd"
d="M6.354 9.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm8.5-8.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
<path fill-rule="evenodd"
d="M10.036 1.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 1 1-1 0V2h-3.5a.5.5 0 0 1-.5-.5z" />
</svg>
<svg *ngSwitchCase="false" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-contract"
fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M9.5 2.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
<path fill-rule="evenodd"
d="M14.354 1.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 1 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm-7.5 7.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
<path fill-rule="evenodd"
d="M2.036 9.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0V10h-3.5a.5.5 0 0 1-.5-.5z" />
</svg>
</i>
</label>
</div>
</div>
<div *ngIf="config.hasDivider" class="dropdown-divider"></div>
</ng-template>
<ngx-dropdown-treeview
[config]="config"
[headerTemplate]="headerTemplate"
[items]="items"
[itemTemplate]="itemTemplate">
</ngx-dropdown-treeview>

View file

@ -0,0 +1,17 @@
<div class="dropdown" ngxDropdown>
<button class="btn" [ngClass]="buttonClass" type="button" role="button" ngxDropdownToggle>
{{buttonLabel}}
</button>
<div ngxDropdownMenu aria-labelledby="dropdownMenu" (click)="$event.stopPropagation()">
<div class="dropdown-container">
<ngx-treeview
[config]="config"
[headerTemplate]="headerTemplate"
[items]="items"
[itemTemplate]="itemTemplate"
(selectedChange)="onSelectedChange($event)"
(filterChange)="onFilterChange($event)">
</ngx-treeview>
</div>
</div>
</div>

View file

@ -0,0 +1,16 @@
<div *ngIf="item" class="treeview-item">
<ng-template
[ngTemplateOutlet]="template"
[ngTemplateOutletContext]="{item: item, onCollapseExpand: onCollapseExpand,
onCheckedChange: onCheckedChange}">
</ng-template>
<div *ngIf="!item.collapsed">
<ngx-treeview-item
[config]="config"
*ngFor="let child of item.children"
[item]="child"
[template]="template"
(checkedChange)="onChildCheckedChange(child, $event)">
</ngx-treeview-item>
</div>
</div>

View file

@ -0,0 +1,92 @@
<ng-template #defaultItemTemplate let-item="item" let-onCollapseExpand="onCollapseExpand"
let-onCheckedChange="onCheckedChange">
<div class="form-inline row-item">
<i *ngIf="item.children" (click)="onCollapseExpand()" aria-hidden="true"
[ngSwitch]="item.collapsed">
<i *ngSwitchCase="true" class="bi bi-caret-right-fill"></i>
<i *ngSwitchCase="false" class="bi bi-caret-down-fill"></i>
</i>
<div class="form-check">
<input type="checkbox" class="form-check-input"
[(ngModel)]="item.checked"
(ngModelChange)="onCheckedChange()"
[disabled]="item.disabled"
[indeterminate]="item.indeterminate" />
<label class="form-check-label" (click)="item.checked = !item.checked; onCheckedChange()">
{{item.text}}
</label>
</div>
</div>
</ng-template>
<ng-template #defaultHeaderTemplate let-config="config" let-item="item"
let-onCollapseExpand="onCollapseExpand" let-onCheckedChange="onCheckedChange"
let-onFilterTextChange="onFilterTextChange">
<div *ngIf="config.hasFilter" class="row row-filter">
<div class="col-12">
<input class="form-control" type="text"
[placeholder]="i18n.getFilterPlaceholder()"
[(ngModel)]="filterText"
(ngModelChange)="onFilterTextChange($event)" />
</div>
</div>
<div *ngIf="hasFilterItems">
<div *ngIf="config.hasAllCheckBox || config.hasCollapseExpand" class="row row-all">
<div class="col-12">
<div class="form-check form-check-inline" *ngIf="config.hasAllCheckBox">
<input type="checkbox" class="form-check-input"
[(ngModel)]="item.checked"
(ngModelChange)="onCheckedChange()"
[indeterminate]="item.indeterminate" />
<label class="form-check-label" (click)="item.checked = !item.checked; onCheckedChange()">
{{i18n.getAllCheckboxText()}}
</label>
</div>
<label *ngIf="config.hasCollapseExpand" class="float-right form-check-label"
(click)="onCollapseExpand()">
<i [title]="i18n.getTooltipCollapseExpandText(item.collapsed)" aria-hidden="true"
[ngSwitch]="item.collapsed">
<svg *ngSwitchCase="true" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-expand"
fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M1.5 10.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
<path fill-rule="evenodd"
d="M6.354 9.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm8.5-8.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
<path fill-rule="evenodd"
d="M10.036 1.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 1 1-1 0V2h-3.5a.5.5 0 0 1-.5-.5z" />
</svg>
<svg *ngSwitchCase="false" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-contract"
fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M9.5 2.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
<path fill-rule="evenodd"
d="M14.354 1.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 1 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm-7.5 7.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
<path fill-rule="evenodd"
d="M2.036 9.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0V10h-3.5a.5.5 0 0 1-.5-.5z" />
</svg>
</i>
</label>
</div>
</div>
<div *ngIf="config.hasDivider" class="dropdown-divider"></div>
</div>
</ng-template>
<div class="treeview-header">
<ng-template
[ngTemplateOutlet]="headerTemplate || defaultHeaderTemplate"
[ngTemplateOutletContext]="headerTemplateContext">
</ng-template>
</div>
<div [ngSwitch]="hasFilterItems">
<div *ngSwitchCase="true" class="treeview-container" [style.max-height.px]="maxHeight">
<ngx-treeview-item
*ngFor="let item of filterItems"
[config]="config"
[item]="item"
[template]="itemTemplate || defaultItemTemplate"
(checkedChange)="onItemCheckedChange(item, $event)">
</ngx-treeview-item>
</div>
<div *ngSwitchCase="false" class="treeview-text">
{{i18n.getFilterNoItemsFoundText()}}
</div>
</div>

View file

@ -0,0 +1,14 @@
<div class="row">
<div class="col-12">
<div class="form-group">
<div class="d-inline-block">
<ngx-dropdown-treeview-select
[items]="items"
[maxHeight]="maxHeight"
[(value)]="value"
(valueChange)="onValueChange($event)">
</ngx-dropdown-treeview-select>
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,20 @@
import {Injectable} from "@angular/core";
import {DefaultTreeviewI18n} from "../lib/treeview-i18n";
import {TreeviewItem, TreeviewSelection} from "../lib/treeview-item";
@Injectable()
export class DropdownTreeviewSelectI18n extends DefaultTreeviewI18n {
private internalSelectedItem: TreeviewItem;
set selectedItem(value: TreeviewItem) {
this.internalSelectedItem = value;
}
get selectedItem(): TreeviewItem {
return this.internalSelectedItem;
}
getText(selection: TreeviewSelection): string {
return this.internalSelectedItem ? this.internalSelectedItem.text : 'Элемент не выбран';
}
}

View file

@ -0,0 +1,78 @@
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
Input,
OnChanges,
Output,
ViewChild
} from '@angular/core';
import { DropdownTreeviewSelectI18n } from './dropdown-treeview-select-i18n';
import { DropdownTreeviewComponent } from "../lib/dropdown-treeview.component";
import { TreeviewConfig } from "../lib/treeview-config";
import { TreeviewHelper } from "../lib/treeview-helper";
import { TreeviewI18n } from "../lib/treeview-i18n";
import { TreeviewItem } from "../lib/treeview-item";
import { isNil } from '../lib/utils';
@Component({
moduleId: module.id,
selector: 'ngx-dropdown-treeview-select',
templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html',
providers: [{ provide: TreeviewI18n, useClass: DropdownTreeviewSelectI18n }],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DropdownTreeviewSelectComponent implements OnChanges {
@Input() config: TreeviewConfig;
@Input() items: TreeviewItem[];
@Input() maxHeight: number;
@Input() value: any;
@Output() valueChange = new EventEmitter<any>();
@ViewChild(DropdownTreeviewComponent) dropdownTreeviewComponent: DropdownTreeviewComponent;
filterText: string;
private dropdownTreeviewSelectI18n: DropdownTreeviewSelectI18n;
constructor(public i18n: TreeviewI18n) {
this.config = TreeviewConfig.create({
hasAllCheckBox: false,
hasCollapseExpand: false,
hasFilter: true,
maxHeight: 500
});
this.dropdownTreeviewSelectI18n = i18n as DropdownTreeviewSelectI18n;
}
ngOnChanges(): void {
if (this.maxHeight) {
this.config.maxHeight = this.maxHeight;
}
this.updateSelectedItem();
}
select(item: TreeviewItem): void {
this.selectItem(item);
}
private updateSelectedItem(): void {
if (!isNil(this.items)) {
const selectedItem = TreeviewHelper.findItemInList(this.items, this.value);
this.selectItem(selectedItem);
}
}
private selectItem(item: TreeviewItem): void {
if (this.dropdownTreeviewSelectI18n.selectedItem !== item) {
this.dropdownTreeviewSelectI18n.selectedItem = item;
if (this.dropdownTreeviewComponent) {
this.dropdownTreeviewComponent.onSelectedChange([item]);
}
if (item) {
if (this.value !== item.value) {
this.value = item.value;
this.valueChange.emit(item.value);
}
}
}
}
}

View file

@ -0,0 +1,22 @@
import { Directive, HostListener } from '@angular/core';
import { DropdownDirective } from './dropdown.directive';
@Directive({
selector: '[ngxDropdownMenu]',
host: {
'[class.dropdown-menu]': 'true',
'[class.show]': 'dropdown.isOpen'
}
})
export class DropdownMenuDirective {
constructor(public dropdown: DropdownDirective) {
}
@HostListener('click', ['$event'])
onClick(event: MouseEvent): void {
if (event.button !== 2 && event.srcElement.attributes[0]
&& event.srcElement.attributes[0].nodeValue === 'form-check-label') {
this.dropdown.close();
}
}
}

View file

@ -0,0 +1,17 @@
import { Directive, ElementRef } from '@angular/core';
import { DropdownDirective } from './dropdown.directive';
@Directive({
selector: '[ngxDropdownToggle]',
host: {
class: 'dropdown-toggle',
'aria-haspopup': 'true',
'[attr.aria-expanded]': 'dropdown.isOpen',
'(click)': 'dropdown.toggle()'
}
})
export class DropdownToggleDirective {
constructor(public dropdown: DropdownDirective, elementRef: ElementRef) {
dropdown.toggleElement = elementRef.nativeElement;
}
}

View file

@ -0,0 +1,49 @@
import {
Component,
EventEmitter,
Input,
Output,
ViewChild,
TemplateRef,
ChangeDetectionStrategy
} from '@angular/core';
import { TreeviewI18n } from './treeview-i18n';
import { TreeviewItem } from './treeview-item';
import { TreeviewConfig } from './treeview-config';
import { TreeviewComponent } from './treeview.component';
import { TreeviewHeaderTemplateContext } from './treeview-header-template-context';
import { TreeviewItemTemplateContext } from './treeview-item-template-context';
@Component({
moduleId: module.id,
selector: 'ngx-dropdown-treeview',
templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DropdownTreeviewComponent {
@Input() buttonClass = 'btn-outline-secondary';
@Input() headerTemplate: TemplateRef<TreeviewHeaderTemplateContext>;
@Input() itemTemplate: TemplateRef<TreeviewItemTemplateContext>;
@Input() items: TreeviewItem[];
@Input() config: TreeviewConfig;
@Output() selectedChange = new EventEmitter<any[]>(true);
@Output() filterChange = new EventEmitter<string>();
@ViewChild(TreeviewComponent) treeviewComponent: TreeviewComponent;
buttonLabel: string;
constructor(
public i18n: TreeviewI18n,
private defaultConfig: TreeviewConfig
) {
this.config = this.defaultConfig;
}
onSelectedChange(values: any[]): void {
this.buttonLabel = this.i18n.getText(this.treeviewComponent.selection);
this.selectedChange.emit(values);
}
onFilterChange(text: string): void {
this.filterChange.emit(text);
}
}

View file

@ -0,0 +1,54 @@
import { Directive, Input, Output, HostBinding, HostListener, EventEmitter } from '@angular/core';
import { isNil } from './utils';
@Directive({
selector: '[ngxDropdown]',
exportAs: 'ngxDropdown'
})
export class DropdownDirective {
toggleElement: any;
@Input('open') internalOpen = false;
@Output() openChange = new EventEmitter<boolean>();
@HostBinding('class.show') get isOpen(): boolean {
return this.internalOpen;
}
@HostListener('keyup.esc')
onKeyupEsc(): void {
this.close();
}
@HostListener('document:click', ['$event'])
onDocumentClick(event: MouseEvent): void {
if (event.button !== 2 && !this.isEventFromToggle(event)) {
this.close();
}
}
open(): void {
if (!this.internalOpen) {
this.internalOpen = true;
this.openChange.emit(true);
}
}
close(): void {
if (this.internalOpen) {
this.internalOpen = false;
this.openChange.emit(false);
}
}
toggle(): void {
if (this.isOpen) {
this.close();
} else {
this.open();
}
}
private isEventFromToggle(event: MouseEvent): boolean {
return !isNil(this.toggleElement) && this.toggleElement.contains(event.target);
}
}

View file

@ -0,0 +1,26 @@
import { Injectable } from '@angular/core';
@Injectable()
export class TreeviewConfig {
hasAllCheckBox = true;
hasFilter = false;
hasCollapseExpand = false;
decoupleChildFromParent = false;
maxHeight = 500;
get hasDivider(): boolean {
return this.hasFilter || this.hasAllCheckBox || this.hasCollapseExpand;
}
public static create(fields?: {
hasAllCheckBox?: boolean,
hasFilter?: boolean,
hasCollapseExpand?: boolean,
decoupleChildFromParent?: boolean
maxHeight?: number,
}): TreeviewConfig {
const config = new TreeviewConfig();
Object.assign(config, fields);
return config;
}
}

View file

@ -0,0 +1,107 @@
import { Injectable } from '@angular/core';
import { TreeviewItem } from './treeview-item';
import {TreeviewComponent} from './treeview.component';
import { isNil } from './utils';
@Injectable()
export abstract class TreeviewEventParser {
abstract getSelectedChange(component: TreeviewComponent): any[];
}
@Injectable()
export class DefaultTreeviewEventParser extends TreeviewEventParser {
getSelectedChange(component: TreeviewComponent): any[] {
const checkedItems = component.selection.checkedItems;
if (!isNil(checkedItems)) {
return checkedItems.map(item => item.value);
}
return [];
}
}
export interface DownlineTreeviewItem {
item: TreeviewItem;
parent: DownlineTreeviewItem;
}
@Injectable()
export class DownlineTreeviewEventParser extends TreeviewEventParser {
getSelectedChange(component: TreeviewComponent): any[] {
const items = component.items;
if (!isNil(items)) {
let result: DownlineTreeviewItem[] = [];
items.forEach(item => {
const links = this.getLinks(item, null);
if (!isNil(links)) {
result = result.concat(links);
}
});
return result;
}
return [];
}
private getLinks(item: TreeviewItem, parent: DownlineTreeviewItem): DownlineTreeviewItem[] {
if (!isNil(item.children)) {
const link = {
item,
parent
};
let result: DownlineTreeviewItem[] = [];
item.children.forEach(child => {
const links = this.getLinks(child, link);
if (!isNil(links)) {
result = result.concat(links);
}
});
return result;
}
if (item.checked) {
return [{
item,
parent
}];
}
return null;
}
}
@Injectable()
export class OrderDownlineTreeviewEventParser extends TreeviewEventParser {
private currentDownlines: DownlineTreeviewItem[] = [];
private parser = new DownlineTreeviewEventParser();
getSelectedChange(component: TreeviewComponent): any[] {
const newDownlines: DownlineTreeviewItem[] = this.parser.getSelectedChange(component);
if (this.currentDownlines.length === 0) {
this.currentDownlines = newDownlines;
} else {
const intersectDownlines: DownlineTreeviewItem[] = [];
this.currentDownlines.forEach(downline => {
let foundIndex = -1;
const length = newDownlines.length;
for (let i = 0; i < length; i++) {
if (downline.item.value === newDownlines[i].item.value) {
foundIndex = i;
break;
}
}
if (foundIndex !== -1) {
intersectDownlines.push(newDownlines[foundIndex]);
newDownlines.splice(foundIndex, 1);
}
});
this.currentDownlines = intersectDownlines.concat(newDownlines);
}
return this.currentDownlines;
}
}

View file

@ -0,0 +1,10 @@
import { TreeviewItem } from './treeview-item';
import { TreeviewConfig } from './treeview-config';
export interface TreeviewHeaderTemplateContext {
config: TreeviewConfig;
item: TreeviewItem;
onCollapseExpand: () => void;
onCheckedChange: (checked: boolean) => void;
onFilterTextChange: (text: string) => void;
}

View file

@ -0,0 +1,94 @@
import { TreeviewItem } from './treeview-item';
import { isNil, pull } from './utils';
export const TreeviewHelper = {
findItem,
findItemInList,
findParent,
removeItem,
concatSelection
};
function findItem(root: TreeviewItem, value: any): TreeviewItem {
if (isNil(root)) {
return undefined;
}
if (root.value === value) {
return root;
}
if (root.children) {
for (const child of root.children) {
const foundItem = findItem(child, value);
if (foundItem) {
return foundItem;
}
}
}
return undefined;
}
function findItemInList(list: TreeviewItem[], value: any): TreeviewItem {
if (isNil(list)) {
return undefined;
}
for (const item of list) {
const foundItem = findItem(item, value);
if (foundItem) {
return foundItem;
}
}
return undefined;
}
function findParent(root: TreeviewItem, item: TreeviewItem): TreeviewItem {
if (isNil(root) || isNil(root.children)) {
return undefined;
}
for (const child of root.children) {
if (child === item) {
return root;
} else {
const parent = findParent(child, item);
if (parent) {
return parent;
}
}
}
return undefined;
}
function removeItem(root: TreeviewItem, item: TreeviewItem): boolean {
const parent = findParent(root, item);
if (parent) {
pull(parent.children, item);
if (parent.children.length === 0) {
parent.children = undefined;
} else {
parent.correctChecked();
}
return true;
}
return false;
}
function concatSelection(items: TreeviewItem[], checked: TreeviewItem[], unchecked: TreeviewItem[]): { [k: string]: TreeviewItem[] } {
let checkedItems = [...checked];
let uncheckedItems = [...unchecked];
for (const item of items) {
const selection = item.getSelection();
checkedItems = checkedItems.concat(selection.checkedItems);
uncheckedItems = uncheckedItems.concat(selection.uncheckedItems);
}
return {
checked: checkedItems,
unchecked: uncheckedItems
};
}

View file

@ -0,0 +1,49 @@
import { Injectable } from '@angular/core';
import { TreeviewSelection } from './treeview-item';
@Injectable()
export abstract class TreeviewI18n {
abstract getText(selection: TreeviewSelection): string;
abstract getAllCheckboxText(): string;
abstract getFilterPlaceholder(): string;
abstract getFilterNoItemsFoundText(): string;
abstract getTooltipCollapseExpandText(isCollapse: boolean): string;
}
@Injectable()
export class DefaultTreeviewI18n extends TreeviewI18n {
getText(selection: TreeviewSelection): string {
if (selection.uncheckedItems.length === 0) {
if (selection.checkedItems.length > 0) {
return this.getAllCheckboxText();
} else {
return '';
}
}
switch (selection.checkedItems.length) {
case 0:
return 'Select options';
case 1:
return selection.checkedItems[0].text;
default:
return `${selection.checkedItems.length} options selected`;
}
}
getAllCheckboxText(): string {
return 'Все';
}
getFilterPlaceholder(): string {
return 'Поиск';
}
getFilterNoItemsFoundText(): string {
return 'Элементы не найдены';
}
getTooltipCollapseExpandText(isCollapse: boolean): string {
return isCollapse ? 'Развернуть' : 'Свернуть';
}
}

View file

@ -0,0 +1,7 @@
import { TreeviewItem } from './treeview-item';
export interface TreeviewItemTemplateContext {
item: TreeviewItem;
onCollapseExpand: () => void;
onCheckedChange: () => void;
}

View file

@ -0,0 +1,68 @@
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
Input,
Output,
TemplateRef
} from '@angular/core';
import { TreeviewConfig } from './treeview-config';
import { TreeviewItem } from './treeview-item';
import { TreeviewItemTemplateContext } from './treeview-item-template-context';
import { isNil } from './utils';
@Component({
moduleId: module.id,
selector: 'ngx-treeview-item',
templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/treeview-item.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class TreeviewItemComponent {
@Input() config: TreeviewConfig;
@Input() template: TemplateRef<TreeviewItemTemplateContext>;
@Input() item: TreeviewItem;
@Output() checkedChange = new EventEmitter<boolean>();
constructor(
private defaultConfig: TreeviewConfig
) {
this.config = this.defaultConfig;
}
onCollapseExpand = () => {
this.item.collapsed = !this.item.collapsed;
}
onCheckedChange = () => {
const checked = this.item.checked;
if (!isNil(this.item.children) && !this.config.decoupleChildFromParent) {
this.item.children.forEach(child => child.setCheckedRecursive(checked));
}
this.checkedChange.emit(checked);
}
onChildCheckedChange(child: TreeviewItem, checked: boolean): void {
if (!this.config.decoupleChildFromParent) {
let itemChecked: boolean = null;
for (const childItem of this.item.children) {
if (itemChecked === null) {
itemChecked = childItem.checked;
} else if (itemChecked !== childItem.checked) {
itemChecked = undefined;
break;
}
}
if (itemChecked === null) {
itemChecked = false;
}
if (this.item.checked !== itemChecked) {
this.item.checked = itemChecked;
}
}
this.checkedChange.emit(checked);
}
}

View file

@ -0,0 +1,185 @@
import { TreeviewHelper } from './treeview-helper';
import { isBoolean, isNil, isString } from './utils';
export interface TreeviewSelection {
checkedItems: TreeviewItem[];
uncheckedItems: TreeviewItem[];
}
export interface TreeItem {
text: string;
value: any;
disabled?: boolean;
checked?: boolean;
collapsed?: boolean;
children?: TreeItem[];
}
export class TreeviewItem {
private internalDisabled = false;
private internalChecked = true;
private internalCollapsed = false;
private internalChildren: TreeviewItem[];
text: string;
value: any;
constructor(item: TreeItem, autoCorrectChecked = false) {
if (isNil(item)) {
throw new Error('Item must be defined');
}
if (isString(item.text)) {
this.text = item.text;
} else {
throw new Error('A text of item must be string object');
}
this.value = item.value;
if (isBoolean(item.checked)) {
this.checked = item.checked;
}
if (isBoolean(item.collapsed)) {
this.collapsed = item.collapsed;
}
if (isBoolean(item.disabled)) {
this.disabled = item.disabled;
}
if (!isNil(item.children) && item.children.length > 0) {
this.children = item.children.map(child => {
if (this.disabled === true) {
child.disabled = true;
}
return new TreeviewItem(child);
});
}
if (autoCorrectChecked) {
this.correctChecked();
}
}
get checked(): boolean {
return this.internalChecked;
}
set checked(value: boolean) {
if (!this.internalDisabled) {
if (this.internalChecked !== value) {
this.internalChecked = value;
}
}
}
get indeterminate(): boolean {
return this.checked === undefined;
}
setCheckedRecursive(value: boolean): void {
if (!this.internalDisabled) {
this.internalChecked = value;
if (!isNil(this.internalChildren)) {
this.internalChildren.forEach(child => child.setCheckedRecursive(value));
}
}
}
get disabled(): boolean {
return this.internalDisabled;
}
set disabled(value: boolean) {
if (this.internalDisabled !== value) {
this.internalDisabled = value;
if (!isNil(this.internalChildren)) {
this.internalChildren.forEach(child => child.disabled = value);
}
}
}
get collapsed(): boolean {
return this.internalCollapsed;
}
set collapsed(value: boolean) {
if (this.internalCollapsed !== value) {
this.internalCollapsed = value;
}
}
setCollapsedRecursive(value: boolean): void {
this.internalCollapsed = value;
if (!isNil(this.internalChildren)) {
this.internalChildren.forEach(child => child.setCollapsedRecursive(value));
}
}
get children(): TreeviewItem[] {
return this.internalChildren;
}
set children(value: TreeviewItem[]) {
if (this.internalChildren !== value) {
if (!isNil(value) && value.length === 0) {
throw new Error('Children must be not an empty array');
}
this.internalChildren = value;
if (!isNil(this.internalChildren)) {
let checked = null;
this.internalChildren.forEach(child => {
if (checked === null) {
checked = child.checked;
} else {
if (child.checked !== checked) {
checked = undefined;
return;
}
}
});
this.internalChecked = checked;
}
}
}
getSelection(): TreeviewSelection {
let checkedItems: TreeviewItem[] = [];
let uncheckedItems: TreeviewItem[] = [];
if (isNil(this.internalChildren)) {
if (this.internalChecked) {
checkedItems.push(this);
} else {
uncheckedItems.push(this);
}
} else {
const selection = TreeviewHelper.concatSelection(this.internalChildren, checkedItems, uncheckedItems);
checkedItems = selection.checked;
uncheckedItems = selection.unchecked;
}
return {
checkedItems,
uncheckedItems
};
}
correctChecked(): void {
this.internalChecked = this.getCorrectChecked();
}
private getCorrectChecked(): boolean {
let checked: boolean = null;
if (!isNil(this.internalChildren)) {
for (const child of this.internalChildren) {
child.internalChecked = child.getCorrectChecked();
if (checked === null) {
checked = child.internalChecked;
} else if (checked !== child.internalChecked) {
checked = undefined;
break;
}
}
} else {
checked = this.checked;
}
return checked;
}
}

View file

@ -0,0 +1,242 @@
import {
Component,
Input,
Output,
EventEmitter,
OnChanges,
OnInit,
SimpleChanges,
TemplateRef,
ChangeDetectionStrategy
} from '@angular/core';
import { TreeviewI18n } from './treeview-i18n';
import { TreeviewItem, TreeviewSelection } from './treeview-item';
import { TreeviewConfig } from './treeview-config';
import { TreeviewEventParser } from './treeview-event-parser';
import { TreeviewHeaderTemplateContext } from './treeview-header-template-context';
import { TreeviewItemTemplateContext } from './treeview-item-template-context';
import { TreeviewHelper } from './treeview-helper';
import { isNil } from './utils';
class FilterTreeviewItem extends TreeviewItem {
private readonly refItem: TreeviewItem;
constructor(item: TreeviewItem) {
super({
text: item.text,
value: item.value,
disabled: item.disabled,
checked: item.checked,
collapsed: item.collapsed,
children: item.children
});
this.refItem = item;
}
updateRefChecked(): void {
this.children.forEach(child => {
if (child instanceof FilterTreeviewItem) {
child.updateRefChecked();
}
});
let refChecked = this.checked;
if (refChecked) {
for (const refChild of this.refItem.children) {
if (!refChild.checked) {
refChecked = false;
break;
}
}
}
this.refItem.checked = refChecked;
}
}
@Component({
moduleId: module.id,
selector: 'ngx-treeview',
templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/treeview.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class TreeviewComponent implements OnChanges, OnInit {
@Input() headerTemplate: TemplateRef<TreeviewHeaderTemplateContext>;
@Input() itemTemplate: TemplateRef<TreeviewItemTemplateContext>;
@Input() items: TreeviewItem[];
@Input() config: TreeviewConfig;
@Output() selectedChange = new EventEmitter<any[]>();
@Output() filterChange = new EventEmitter<string>();
headerTemplateContext: TreeviewHeaderTemplateContext;
allItem: TreeviewItem;
filterText = '';
filterItems: TreeviewItem[];
selection: TreeviewSelection;
constructor(
public i18n: TreeviewI18n,
private defaultConfig: TreeviewConfig,
private eventParser: TreeviewEventParser
) {
this.config = this.defaultConfig;
this.allItem = new TreeviewItem({ text: 'All', value: undefined });
}
get hasFilterItems(): boolean {
return !isNil(this.filterItems) && this.filterItems.length > 0;
}
get maxHeight(): string {
return `${this.config.maxHeight}`;
}
ngOnInit(): void {
this.createHeaderTemplateContext();
this.generateSelection();
}
ngOnChanges(changes: SimpleChanges): void {
const itemsSimpleChange = changes.items;
if (!isNil(itemsSimpleChange) && !isNil(this.items)) {
this.updateFilterItems();
this.updateCollapsedOfAll();
this.raiseSelectedChange();
}
}
onAllCollapseExpand(): void {
this.allItem.collapsed = !this.allItem.collapsed;
this.filterItems.forEach(item => item.setCollapsedRecursive(this.allItem.collapsed));
}
onFilterTextChange(text: string): void {
this.filterText = text;
this.filterChange.emit(text);
this.updateFilterItems();
}
onAllCheckedChange(): void {
const checked = this.allItem.checked;
this.filterItems.forEach(item => {
item.setCheckedRecursive(checked);
if (item instanceof FilterTreeviewItem) {
item.updateRefChecked();
}
});
this.raiseSelectedChange();
}
onItemCheckedChange(item: TreeviewItem, checked: boolean): void {
if (item instanceof FilterTreeviewItem) {
item.updateRefChecked();
}
this.updateCheckedOfAll();
this.raiseSelectedChange();
}
raiseSelectedChange(): void {
this.generateSelection();
const values = this.eventParser.getSelectedChange(this);
setTimeout(() => {
this.selectedChange.emit(values);
});
}
private createHeaderTemplateContext(): void {
this.headerTemplateContext = {
config: this.config,
item: this.allItem,
onCheckedChange: () => this.onAllCheckedChange(),
onCollapseExpand: () => this.onAllCollapseExpand(),
onFilterTextChange: (text) => this.onFilterTextChange(text)
};
}
private generateSelection(): void {
let checkedItems: TreeviewItem[] = [];
let uncheckedItems: TreeviewItem[] = [];
if (!isNil(this.items)) {
const selection = TreeviewHelper.concatSelection(this.items, checkedItems, uncheckedItems);
checkedItems = selection.checked;
uncheckedItems = selection.unchecked;
}
this.selection = {
checkedItems,
uncheckedItems
};
}
private updateFilterItems(): void {
if (this.filterText !== '') {
const filterItems: TreeviewItem[] = [];
const filterText = this.filterText.toLowerCase();
this.items.forEach(item => {
const newItem = this.filterItem(item, filterText);
if (!isNil(newItem)) {
filterItems.push(newItem);
}
});
this.filterItems = filterItems;
} else {
this.filterItems = this.items;
}
this.updateCheckedOfAll();
}
private filterItem(item: TreeviewItem, filterText: string): TreeviewItem {
const isMatch = item.text.toLowerCase().includes(filterText);
if (isMatch) {
return item;
} else {
if (!isNil(item.children)) {
const children: TreeviewItem[] = [];
item.children.forEach(child => {
const newChild = this.filterItem(child, filterText);
if (!isNil(newChild)) {
children.push(newChild);
}
});
if (children.length > 0) {
const newItem = new FilterTreeviewItem(item);
newItem.collapsed = false;
newItem.children = children;
return newItem;
}
}
}
return undefined;
}
private updateCheckedOfAll(): void {
let itemChecked: boolean = null;
for (const filterItem of this.filterItems) {
if (itemChecked === null) {
itemChecked = filterItem.checked;
} else if (itemChecked !== filterItem.checked) {
itemChecked = undefined;
break;
}
}
if (itemChecked === null) {
itemChecked = false;
}
this.allItem.checked = itemChecked;
}
private updateCollapsedOfAll(): void {
let hasItemExpanded = false;
for (const filterItem of this.filterItems) {
if (!filterItem.collapsed) {
hasItemExpanded = true;
break;
}
}
this.allItem.collapsed = !hasItemExpanded;
}
}

View file

@ -0,0 +1,48 @@
import { NgModule, ModuleWithProviders } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { DropdownDirective } from './dropdown.directive';
import { DropdownMenuDirective } from './dropdown-menu.directive';
import { DropdownToggleDirective } from './dropdown-toggle.directive';
import { DropdownTreeviewComponent } from './dropdown-treeview.component';
import { TreeviewComponent } from './treeview.component';
import { TreeviewItemComponent } from './treeview-item.component';
import { TreeviewPipe } from './treeview.pipe';
import { TreeviewI18n, DefaultTreeviewI18n } from './treeview-i18n';
import { TreeviewConfig } from './treeview-config';
import { TreeviewEventParser, DefaultTreeviewEventParser } from './treeview-event-parser';
@NgModule({
imports: [
FormsModule,
CommonModule
],
declarations: [
// TreeviewComponent,
// TreeviewItemComponent,
TreeviewPipe,
DropdownDirective,
DropdownMenuDirective,
DropdownToggleDirective
// DropdownTreeviewComponent
], exports: [
// TreeviewComponent,
TreeviewPipe,
DropdownDirective,
DropdownMenuDirective,
DropdownToggleDirective
// DropdownTreeviewComponent
]
})
export class TreeviewModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: TreeviewModule,
providers: [
TreeviewConfig,
{ provide: TreeviewI18n, useClass: DefaultTreeviewI18n },
{ provide: TreeviewEventParser, useClass: DefaultTreeviewEventParser }
]
};
}
}

View file

@ -0,0 +1,16 @@
import { Pipe, PipeTransform } from '@angular/core';
import { TreeviewItem } from './treeview-item';
import { isNil } from './utils';
@Pipe({
name: 'ngxTreeview'
})
export class TreeviewPipe implements PipeTransform {
transform(objects: any[], textField: string): TreeviewItem[] {
if (isNil(objects)) {
return undefined;
}
return objects.map(object => new TreeviewItem({ text: object[textField], value: object }));
}
}

View file

@ -0,0 +1,45 @@
export default class Utils {
static isBoolean(value): boolean { return isBoolean(value); }
static isNil(value): boolean { return isNil(value); }
static isString(value): boolean { return isString(value); }
};
export const isBoolean = (value:any): boolean => {
return value === true || value === false; // todo not completed; to complete from 'lodash'
};
export const isNil = (value:any): boolean => {
// from 'lodash'
return value == null;
};
export const isString = (value:any): boolean => {
return typeof value == 'string'; // todo not completed; to complete from 'lodash'
};
export const pull = (array:any[], item:any): any[] => {
// modified 'remove' from 'lodash'
// mutate array
const result = [];
if (!(array && array.length)) {
return result;
}
const indexes = [];
array.forEach((value, index) => {
if (value === item) {
result.push(value);
indexes.push(index);
}
});
for (const index of indexes.reverse()) {
array.splice(index, 1);
}
return result;
};
export const reverse = (array:any[]): any[] => {
// from 'lodash'
return array == null ? array : array.reverse();
};

View file

@ -0,0 +1,107 @@
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core";
import {Control, Event, UserService, Visible} from "@webbpm/base-package";
import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item";
import {
DropdownTreeviewSelectI18n
} from "../external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n";
import {TreeItemDto} from "../../generated/component/model/TreeItemDto";
import {TreeItemRpcService} from "../../generated/component/rpc/TreeItemRpcService";
@Component({
moduleId: module.id,
selector: 'dropdown-tree-view',
templateUrl: './../../../../src/resources/template/component/field/DropdownTreeView.html',
providers: [{
provide: DropdownTreeviewSelectI18n, useClass: DropdownTreeviewSelectI18n
}],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DropdownTreeViewComponent extends Control {
public collapseLevel: number;
public maxHeight: number;
@Visible("false")
public items: TreeviewItem[];
@Visible("false")
public value: any;
@Visible("false")
public valueChangeEvent: Event<TreeItemDto> = new Event<TreeItemDto>();
private rpcService: TreeItemRpcService;
constructor(el: ElementRef, cd: ChangeDetectorRef,
// todo replace UserService by another one from SUPPORT-8421 providing accountId or domainId
private i18n: DropdownTreeviewSelectI18n, private userService: UserService) {
super(el, cd);
}
public initialize() {
super.initialize();
this.rpcService = this.getScript(TreeItemRpcService);
this.loadTreeItems();
}
@Visible()
public loadTreeItems(): void {
// todo replace the called method by
// this.rpcService.loadTreeDataByDomainId(domainId)
this.rpcService.loadTreeData()
.then((res: TreeItemDto[]) => {
this.items = res.map(value => new TreeviewItem(this.createTreeItem(value)));
const rootItem = this.items[0];
this.i18n.selectedItem = rootItem;
this.value = rootItem.value;
this.doCollapseLevel();
this.cd.markForCheck();
});
}
private createTreeItem(treeItemDto: TreeItemDto): TreeItem {
let treeItem: TreeItem;
if (treeItemDto) {
treeItem = {
text: treeItemDto.label,
value: treeItemDto,
children: this.createTreeItemArray(treeItemDto.children)
};
}
return treeItem;
}
private createTreeItemArray(treeItemDtoArray: TreeItemDto[]): TreeItem[] {
if (treeItemDtoArray && treeItemDtoArray.length > 0) {
return treeItemDtoArray.map(value => this.createTreeItem(value));
}
return undefined;
}
public onValueChange($event: any) {
this.valueChangeEvent.trigger($event);
}
@Visible()
public getBusinessId(): any {
return this.value ? this.value.businessId : this.value;
}
@Visible()
public setCollapseLevel(level: number): void {
this.collapseLevel = level;
}
private doCollapseLevel(): void {
if (this.items != null && this.collapseLevel != null) {
this.items.forEach((value) => this.checkCollapseLevelRecursive(value, 0));
}
}
private checkCollapseLevelRecursive(viewItem: TreeviewItem, level: number): void {
if (level != null && this.collapseLevel != null && level >= this.collapseLevel) {
viewItem.setCollapsedRecursive(true);
}
else if (viewItem.children != null) {
viewItem.children.forEach((value) => this.checkCollapseLevelRecursive(value, level + 1))
}
}
}

View file

@ -21,6 +21,12 @@ import {AppProgressIndicationComponent} from "./component/app-progress-indicatio
import {AppProgressIndicationService} from "./service/app-progress-indication.service";
import {ErvuChartV2} from "../../ervu-dashboard/component/chart/ErvuChartV2";
import {FilterContainer} from "../../ervu-dashboard/component/filter/FilterContainer";
import {DropdownTreeViewComponent} from "../../component/field/DropdownTreeViewComponent";
import {DropdownTreeviewSelectComponent} from "../../component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component";
import {DropdownTreeviewComponent} from "../../component/external/ngx-treeview/lib/dropdown-treeview.component";
import {TreeviewModule} from '../../component/external/ngx-treeview/lib/treeview.module';
import {TreeviewComponent} from "../../component/external/ngx-treeview/lib/treeview.component";
import {TreeviewItemComponent} from "../../component/external/ngx-treeview/lib/treeview-item.component";
registerLocaleData(localeRu);
export const DIRECTIVES = [
@ -30,7 +36,12 @@ export const DIRECTIVES = [
forwardRef(() => AccessDeniedComponent),
forwardRef(() => AppProgressIndicationComponent),
forwardRef(() => ErvuChartV2),
forwardRef(() => FilterContainer)
forwardRef(() => FilterContainer),
forwardRef(() => DropdownTreeViewComponent),
forwardRef(() => DropdownTreeviewComponent),
forwardRef(() => DropdownTreeviewSelectComponent),
forwardRef(() => TreeviewComponent),
forwardRef(() => TreeviewItemComponent)
];
@NgModule({
@ -44,7 +55,8 @@ export const DIRECTIVES = [
ComponentsModule,
AgGridModule,
RouterModule,
InternationalPhoneNumberModule
InternationalPhoneNumberModule,
TreeviewModule.forRoot()
],
declarations: [
DIRECTIVES

View file

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xmlComponent>
<id>dd241482-d901-4d0b-9ad2-4d69b6661f82</id>
<name>DropdownTreeView</name>
<category>fields</category>
<internal>false</internal>
<versions>
<studioVersion>3.177.3</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.177.3</value>
</entry>
</packageVersions>
</versions>
<rootObject id="630accd8-3776-4fc1-a87c-3a0f05274678">
<name>DropdownTreeView</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="e1d0d895-79ee-4230-a47c-e4086b8dbfdb">
<classRef type="TS">
<className>DropdownTreeViewComponent</className>
<packageName>component.field</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>visible</key>
<value>
<simple>true</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="bba43bd6-32d0-4039-bd0c-2d70871a2649">
<classRef type="JAVA">
<className>TreeItemRpcService</className>
<packageName>component.rpc</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</rootObject>
</xmlComponent>

View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<xmlComponent>
<id>236ea5f5-8f3b-4266-9395-e7062180423d</id>
<name>FilterDropdownTreeView</name>
<category>filters</category>
<internal>false</internal>
<versions>
<studioVersion>3.177.3</studioVersion>
<packageVersions>
<entry>
<key>ru.cg.webbpm.packages.base.resources</key>
<value>3.177.3</value>
</entry>
</packageVersions>
</versions>
<rootObject id="97aef2b8-52a1-47f4-a930-9b0bce6994f9">
<name>FilterDropdownTreeView</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="977e4959-7aa0-4530-b424-74bb5d24c6f7">
<classRef type="TS">
<className>DropdownTreeViewComponent</className>
<packageName>component.field</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
<scripts id="7f107b73-51a9-4dd0-a277-9315aa09cea9">
<classRef type="TS">
<className>FilterComponent</className>
<packageName>component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
</scripts>
</rootObject>
</xmlComponent>

View file

@ -206,9 +206,9 @@
</scripts>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="ef6b1859-1146-4e08-9b35-19c3af856acf">
<children id="223ff98e-a925-49c3-9735-7d1fa2f9fcb0">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>ef6b1859-1146-4e08-9b35-19c3af856acf</componentRootId>
<componentRootId>223ff98e-a925-49c3-9735-7d1fa2f9fcb0</componentRootId>
<name>Combo box</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
@ -345,6 +345,20 @@
<enabled>false</enabled>
</scripts>
</children>
<children id="ef6b1859-1146-4e08-9b35-19c3af856acf">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>ef6b1859-1146-4e08-9b35-19c3af856acf</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="ecdabc20-20d2-473f-886a-e3e53a4cb4f1">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>ecdabc20-20d2-473f-886a-e3e53a4cb4f1</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="b3b5d14e-7ecd-46cd-93b4-60841cabb472">
<prototypeId>bce312bd-0c82-45e5-89dc-a1af90431c18</prototypeId>
<componentRootId>b3b5d14e-7ecd-46cd-93b4-60841cabb472</componentRootId>
@ -357,6 +371,7 @@
<componentRootId>019f0534-870c-4e92-b6e9-b65afcdc0238</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -630,7 +645,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -663,7 +678,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1818,7 +1833,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1851,7 +1866,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -2327,7 +2342,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -2360,7 +2375,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3696,7 +3711,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3729,7 +3744,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4255,7 +4270,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4288,7 +4303,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>

View file

@ -251,6 +251,20 @@
<componentRootId>47490b00-a300-41e5-9ad6-a9dcfde20e18</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="a82fddb1-5654-4b24-a337-c164f22af58f">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>a82fddb1-5654-4b24-a337-c164f22af58f</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="90036811-af6e-4962-b234-9f90dcb95375">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>90036811-af6e-4962-b234-9f90dcb95375</componentRootId>
<name>Combo box</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
<properties>
@ -397,6 +411,7 @@
<componentRootId>4cf989ce-b7fb-4e56-b6b1-38dc1a9149ac</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -601,7 +616,6 @@
<componentRootId>922d5930-d22f-4b74-9912-17543cbc8493</componentRootId>
<name>VB - фильтры</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -626,6 +640,7 @@
<componentRootId>fa7ae3c8-ea04-4655-8e67-34adece37342</componentRootId>
<name>HB - заголовок</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -1424,7 +1439,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1470,7 +1485,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1521,7 +1536,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1611,7 +1626,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>

File diff suppressed because one or more lines are too long

View file

@ -193,6 +193,20 @@
<componentRootId>1776e9b1-dafa-47ee-8d99-b6797144cc93</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="88a51057-2192-426e-b46b-96abbcb90608">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>88a51057-2192-426e-b46b-96abbcb90608</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="7c78831c-9af0-49d2-9f7e-b357abf0a6ef">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>7c78831c-9af0-49d2-9f7e-b357abf0a6ef</componentRootId>
<name>Combo box</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
@ -345,6 +359,7 @@
<componentRootId>9021abd0-d34a-43f2-a12d-649e728db7b1</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -416,6 +431,13 @@
</properties>
</scripts>
</children>
<children id="88a51057-2192-426e-b46b-96abbcb90608">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>88a51057-2192-426e-b46b-96abbcb90608</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="c696d351-c814-4abb-9f9e-fbb50eadfc49">
<prototypeId>fd7e47b9-dce1-4d14-9f3a-580c79f59579</prototypeId>
<componentRootId>c696d351-c814-4abb-9f9e-fbb50eadfc49</componentRootId>
@ -600,7 +622,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -633,7 +655,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -717,6 +739,7 @@
<componentRootId>c628b56d-670d-4067-8dd9-0843420c1499</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -1569,6 +1592,7 @@
<componentRootId>42f079fa-ffe9-49b0-b8f7-aac7ceb54563</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2954,7 +2978,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -2987,7 +3011,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3958,6 +3982,7 @@
<componentRootId>ec109c35-b859-43cc-ae23-df59e10a11b0</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -5551,7 +5576,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5584,7 +5609,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5647,6 +5672,7 @@
<componentRootId>99c90421-8054-4f0e-9d5e-aa1c29e23ecc</componentRootId>
<name>Горизонтальный контейнер - Попадающие под призыв</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -7511,7 +7537,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7544,7 +7570,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9445,6 +9471,7 @@
<componentRootId>bf17f367-0137-4d8b-8168-6b7c38d287a2</componentRootId>
<name>VB - Обжалование</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -9513,7 +9540,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9546,7 +9573,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>

View file

@ -331,11 +331,19 @@
</entry>
</properties>
</scripts>
<children id="a7c50c86-84f8-4092-8fbc-d04c6d2adbb1">
<children id="cf76edb6-2f7a-4017-877e-0f49bdec7e93">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>cf76edb6-2f7a-4017-877e-0f49bdec7e93</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="a16e0d37-04dc-47b5-b7a6-b162bdbe1f40">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>a7c50c86-84f8-4092-8fbc-d04c6d2adbb1</componentRootId>
<componentRootId>a16e0d37-04dc-47b5-b7a6-b162bdbe1f40</componentRootId>
<name>Combo box</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
<properties>
@ -510,6 +518,7 @@
<componentRootId>06e1198c-f255-420a-b577-6de772702bb1</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -772,7 +781,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -805,7 +814,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -2965,6 +2974,7 @@
<componentRootId>ec7e0341-cba8-4c6a-a472-6ff1dd337054</componentRootId>
<name>Возраст и Дети до 18лет</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -2976,6 +2986,7 @@
<componentRootId>af7000dd-283a-45b6-acbf-6e1de7f22f88</componentRootId>
<name>Возраст</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3168,7 +3179,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3201,7 +3212,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3912,7 +3923,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3945,7 +3956,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4689,7 +4700,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4722,7 +4733,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5437,7 +5448,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5470,7 +5481,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6214,7 +6225,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6247,7 +6258,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6958,7 +6969,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6991,7 +7002,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7831,7 +7842,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7864,7 +7875,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9448,7 +9459,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9481,7 +9492,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -11065,7 +11076,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -11098,7 +11109,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -12598,6 +12609,7 @@
<componentRootId>2359c3ed-8136-4822-9e4c-e741b5686010</componentRootId>
<name>VB - семейное положение</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -13002,6 +13014,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -13096,7 +13109,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -13129,7 +13142,7 @@
<value>
<item id="ce8434b2-786b-4ba8-84d9-85bd01145069" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -13269,6 +13282,7 @@
<componentRootId>221f086a-83ce-4516-af03-aa6bb50eb427</componentRootId>
<name>VB - в браке/холост</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -13345,7 +13359,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -13378,7 +13392,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -14358,6 +14372,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -14466,7 +14481,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -14499,7 +14514,7 @@
<value>
<item id="33d7e25a-a476-4cfb-a5cb-bca35ebee721" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -14703,7 +14718,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -14736,7 +14751,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -15716,6 +15731,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -15810,7 +15826,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -15843,7 +15859,7 @@
<value>
<item id="ddcec6ec-af6e-41b4-84f4-41afaa5f447b" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -16047,7 +16063,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -16080,7 +16096,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -16753,6 +16769,7 @@
<componentRootId>0caafab8-de1c-42b0-b845-fca7e0e97ec3</componentRootId>
<name>VB - Занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -17186,6 +17203,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -17262,7 +17280,7 @@
<value>
<item id="6ef85ab8-b0db-48ac-971e-52f93e2b2868" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -17313,7 +17331,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -17442,6 +17460,7 @@
<componentRootId>040d034c-91b6-484e-89be-61240013bfeb</componentRootId>
<name>VB - в учатся/работают/безработ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -17518,7 +17537,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -17551,7 +17570,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -18418,6 +18437,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -18428,7 +18448,6 @@
<packageName>ervu-dashboard.component.chart</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>cssClasses</key>
@ -18527,7 +18546,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -18560,7 +18579,7 @@
<value>
<item id="fd9a3ff1-4f9e-4265-9b86-776f19d35674" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -18688,6 +18707,7 @@
<componentRootId>84a87967-c60c-4b7a-83d1-9f1ec58fba16</componentRootId>
<name>VB - в учатся/работают/безработ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -18764,7 +18784,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -18797,7 +18817,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -19657,6 +19677,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -19765,7 +19786,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -19798,7 +19819,7 @@
<value>
<item id="1134158a-1384-4c95-a6d7-3dade82c60dd" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -19926,6 +19947,7 @@
<componentRootId>5fbce3e8-88d1-48da-b868-aa00549af586</componentRootId>
<name>VB - в учатся/работают/безработ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -20002,7 +20024,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -20035,7 +20057,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -20570,6 +20592,7 @@
<componentRootId>28f4be3e-5a7f-4c9c-b414-5ed0d0107739</componentRootId>
<name>Наличие водительского удостоверения</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -20762,7 +20785,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -20795,7 +20818,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -21748,7 +21771,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -21781,7 +21804,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -22761,7 +22784,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -22794,7 +22817,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -23747,7 +23770,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -23780,7 +23803,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -24760,7 +24783,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -24793,7 +24816,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -25746,7 +25769,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -25779,7 +25802,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -26839,7 +26862,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -26872,7 +26895,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -27273,6 +27296,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -27374,7 +27398,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -27407,7 +27431,7 @@
<value>
<item id="a0b1dad2-97f6-47a9-ac22-4dc38ec449e2" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -28713,7 +28737,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -28746,7 +28770,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -28809,7 +28833,6 @@
<componentRootId>04c978b3-c4d4-4fd3-a7f3-1279b7f7f9b9</componentRootId>
<name>VB - график</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -29148,6 +29171,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -29249,7 +29273,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -29282,7 +29306,7 @@
<value>
<item id="a422c788-c78c-476c-ba8a-f7957b13620b" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -30616,7 +30640,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -30649,7 +30673,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -30712,7 +30736,6 @@
<componentRootId>6fcfa6af-0c5d-4c83-b34d-2bfe7363d121</componentRootId>
<name>VB - график</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -31046,6 +31069,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -31147,7 +31171,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -31180,7 +31204,7 @@
<value>
<item id="072410e1-7682-42bc-a1e8-7712d064580b" removed="false">
<value>
<simple>{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
<simple>{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"}</simple>
</value>
</item>
</value>

View file

@ -26,6 +26,7 @@
<componentRootId>2a5b0bb1-72ef-4473-9006-0cde6cb5dc62</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -300,6 +301,20 @@
<componentRootId>49393e6f-f349-4f15-99ca-f0f3e794f67d</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="f3ba1055-e764-420f-9c42-3232bbcbb321">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>f3ba1055-e764-420f-9c42-3232bbcbb321</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="41e6e628-5e34-4e8b-894b-1f60d3461bd0">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>41e6e628-5e34-4e8b-894b-1f60d3461bd0</componentRootId>
<name>Combo box</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
@ -490,6 +505,7 @@
<componentRootId>be84d33b-5d20-416f-8393-1328fd5ed190</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -752,7 +768,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -787,7 +803,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3025,6 +3041,7 @@
<componentRootId>76298b31-e12e-4ce4-b510-3e2378cb672c</componentRootId>
<name>VB - Возраст и занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -3036,6 +3053,7 @@
<componentRootId>90815563-92e7-462e-9799-94bc6347c6b1</componentRootId>
<name>Возраст</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3228,7 +3246,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3261,7 +3279,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3972,7 +3990,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4005,7 +4023,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4749,7 +4767,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -4782,7 +4800,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5493,7 +5511,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5526,7 +5544,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6270,7 +6288,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6303,7 +6321,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7014,7 +7032,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7047,7 +7065,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7695,6 +7713,7 @@
<componentRootId>e304e85c-a38b-48f9-82b6-2b3fc14a912c</componentRootId>
<name>VB - Занятость</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -8097,7 +8116,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -8130,7 +8149,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -8995,7 +9014,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9028,7 +9047,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9897,7 +9916,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9930,7 +9949,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -10544,7 +10563,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -10577,7 +10596,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -10640,6 +10659,7 @@
<componentRootId>1e4b856b-4819-4132-90e2-6b29bdf48081</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -10723,6 +10743,7 @@
<componentRootId>3fec20ea-9d76-4166-af15-048e370dd6da</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -12767,7 +12788,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -12800,7 +12821,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -12919,6 +12940,20 @@
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
<children id="30f1bbf2-b94b-4c47-97d0-d9240ba51b28">
<prototypeId>27912fc5-0be7-4d4c-ae46-a82979253599</prototypeId>
<componentRootId>30f1bbf2-b94b-4c47-97d0-d9240ba51b28</componentRootId>
<name>Filter group</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="bc422eca-7177-433c-a0a5-d77f022ac443">
<prototypeId>97aef2b8-52a1-47f4-a930-9b0bce6994f9</prototypeId>
<componentRootId>bc422eca-7177-433c-a0a5-d77f022ac443</componentRootId>
<name>FilterDropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="621e0b1c-cdec-4ed6-a82e-bc259a6fd4fa">
<prototypeId>85eb12aa-f878-4e29-b109-9d31af0fefb4</prototypeId>
<componentRootId>621e0b1c-cdec-4ed6-a82e-bc259a6fd4fa</componentRootId>
@ -13375,6 +13410,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
<implRef type="JAVA">
<className>RoundSingleChartDataSetService</className>
<packageName>ervu_dashboard.component.chart</packageName>
@ -13497,7 +13533,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -13530,7 +13566,7 @@
<value>
<item id="99b49615-1e35-49af-b422-2bd7832d4865" removed="false">
<value>
<simple>{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
<simple>{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
</value>
</item>
</value>

View file

@ -252,6 +252,20 @@
<componentRootId>fdad3248-54b5-4d3d-914e-ad8d4d5ec0ff</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="25b29b33-5c56-485c-b734-6c48669448ef">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>25b29b33-5c56-485c-b734-6c48669448ef</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="487a7008-1a93-4ea4-8524-067728b8597d">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>487a7008-1a93-4ea4-8524-067728b8597d</componentRootId>
<name>Combo box</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
@ -397,6 +411,7 @@
<componentRootId>2215cb71-27f6-4db2-a7c4-438498404c86</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1254,6 +1269,7 @@
<componentRootId>a24d8714-b47f-4f2e-8ff4-3c120ab1f7ad</componentRootId>
<name>HB - title</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>

View file

@ -288,9 +288,16 @@
</entry>
</properties>
</scripts>
<children id="c02754db-ba91-4be8-b11a-06e2c5dada24">
<children id="051c3e53-8e91-4ba4-8b5d-a2c20865adc9">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>051c3e53-8e91-4ba4-8b5d-a2c20865adc9</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="ba22549b-4759-40d8-8d78-aa13b3a332c0">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>c02754db-ba91-4be8-b11a-06e2c5dada24</componentRootId>
<componentRootId>ba22549b-4759-40d8-8d78-aa13b3a332c0</componentRootId>
<name>Combo box</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
@ -482,6 +489,7 @@
<componentRootId>c129b37c-c980-4ce5-b152-ca154807a6a2</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -680,6 +688,7 @@
<componentRootId>7206a4d4-1dd2-4a36-bad7-a692bf291d79</componentRootId>
<name>VB - Призыв</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -890,7 +899,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -923,7 +932,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1124,6 +1133,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
<implRef type="JAVA">
<className>DoughnutMockChartV2Service</className>
<packageName>ervu_dashboard.component.chart</packageName>
@ -1889,6 +1899,7 @@
<componentRootId>7589d279-f6bc-430a-8a9d-908a84af789d</componentRootId>
<name>VB - весна</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e">
@ -1939,7 +1950,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -1972,7 +1983,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -2920,6 +2931,7 @@
<componentRootId>0a07229f-1c03-4f45-8651-c70f6b68df74</componentRootId>
<name>VB - Повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3071,7 +3083,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3104,7 +3116,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3669,7 +3681,6 @@
<packageName>ervu-dashboard.component.chart</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>cssClasses</key>
@ -3799,7 +3810,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -3832,7 +3843,7 @@
<value>
<item id="954f0522-ba4f-4ec9-a3b8-194074b85f7b" removed="false">
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -5914,7 +5925,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5947,7 +5958,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -6503,7 +6514,6 @@
<packageName>ervu-dashboard.component.chart</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>bars</key>
@ -6741,7 +6751,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -6774,7 +6784,7 @@
<value>
<item id="2b6e1a90-6bda-4b55-85a4-d5ce692d8ebb" removed="false">
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
</value>
</item>
</value>
@ -8946,6 +8956,7 @@
<componentRootId>3123f8a4-427f-4986-8238-d1918dab7198</componentRootId>
<name>VB - осень</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e">
@ -8962,7 +8973,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -8996,7 +9007,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9029,7 +9040,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -9062,7 +9073,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -9165,6 +9176,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
<implRef type="JAVA">
<className>DoughnutMockChartV2Service</className>
<packageName>ervu_dashboard.component.chart</packageName>
@ -9219,7 +9231,6 @@
<componentRootId>4650f6c6-bb8e-4c1d-9201-df57ada9e0fe</componentRootId>
<name>HB - решено</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -9533,7 +9544,6 @@
<componentRootId>a7fda8f9-000f-4400-b040-24c842938ac1</componentRootId>
<name>HB - не решено</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -9847,7 +9857,6 @@
<componentRootId>e16ef66d-a068-4623-86cb-97ba74bc9442</componentRootId>
<name>HB - время решения</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -10027,7 +10036,6 @@
<componentRootId>9661fbc4-ea41-4206-95f0-e15b0fc8c3e3</componentRootId>
<name>HB - оценка удовлетворенности</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -10266,7 +10274,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -10300,7 +10308,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -10333,7 +10341,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -10366,7 +10374,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>

View file

@ -292,6 +292,20 @@
<componentRootId>01426200-9f22-492e-a812-b9d08afd02ce</componentRootId>
<name>Combo box</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="bcda3e31-265c-4f80-8984-fd0359b0fc36">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>bcda3e31-265c-4f80-8984-fd0359b0fc36</componentRootId>
<name>DropdownTreeView</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="e80a965c-389c-4a42-ade9-cc551317f3a6">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>e80a965c-389c-4a42-ade9-cc551317f3a6</componentRootId>
<name>Combo box</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
@ -475,6 +489,7 @@
<componentRootId>85a7fcd5-52c1-4e3f-98b6-fddbf951c1c4</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -673,6 +688,7 @@
<componentRootId>1c6c88af-a164-4e0d-9cbb-a6bc59d30414</componentRootId>
<name>Всего состоят на учете</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -736,7 +752,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -769,7 +785,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3057,6 +3073,7 @@
<componentRootId>01003c5b-75c8-496d-98da-c3c2620dc0aa</componentRootId>
<name>Категории постановки на ВУ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3120,7 +3137,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -3153,7 +3170,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5333,7 +5350,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -5366,7 +5383,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7627,7 +7644,6 @@
<componentRootId>a00e8828-e03e-434a-98f8-7dfd6575a687</componentRootId>
<name>VB - Повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -7696,7 +7712,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -7729,7 +7745,7 @@
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
@ -8324,6 +8340,7 @@
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
</properties>
@ -8439,7 +8456,7 @@
<entry>
<key>filterComponent</key>
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"}</simple>
</value>
</entry>
<entry>
@ -8472,7 +8489,7 @@
<value>
<item id="034b7890-e18f-4a08-8bf7-a2f7b9563d68" removed="false">
<value>
<simple>{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
<simple>{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"}</simple>
</value>
</item>
</value>