diff --git a/backend/pom.xml b/backend/pom.xml index 2a903b5a..b2007380 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/backend/src/main/java/component/model/TreeItemDto.java b/backend/src/main/java/component/model/TreeItemDto.java new file mode 100644 index 00000000..d62eb049 --- /dev/null +++ b/backend/src/main/java/component/model/TreeItemDto.java @@ -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; + } +} diff --git a/backend/src/main/java/component/rpc/TreeItemRpcService.java b/backend/src/main/java/component/rpc/TreeItemRpcService.java new file mode 100644 index 00000000..0e174d3b --- /dev/null +++ b/backend/src/main/java/component/rpc/TreeItemRpcService.java @@ -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 loadTreeData() { + return treeItemService.loadTreeData(); + } + + @RpcCall + public List loadTreeDataByDomainId(String domainId) { + return treeItemService.loadTreeDataByDomainId(domainId); + } +} diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java new file mode 100644 index 00000000..fbb170bc --- /dev/null +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -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 loadTreeData() { + List loadedTreeItems = loadTreeItems(); + loadedTreeItems.forEach(item -> item.domainId = null); + return loadedTreeItems.stream() + .filter(item -> item.parentId == null) + .toList(); + } + + public List loadTreeDataByDomainId(String domainId) { + if (domainId == null || domainIdColumn == null) { + return loadTreeData(); + } + + List 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 loadTreeItems() { + List loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream() + .map(this::toTreeItemDto) + .toList(); + + Map> childrenMap = new HashMap<>(); + loadedList.forEach(item -> { + Object parentId = item.parentId; + if (parentId != null) { + List listFromMap = childrenMap.computeIfAbsent(parentId, + k -> new ArrayList<>() + ); + listFromMap.add(item); + } + }); + + loadedList.forEach(item -> { + List children = childrenMap.get(item.id); + if (children != null) { + item.children = children.toArray(new TreeItemDto[0]); + } + }); + return loadedList; + } + + private Set getColumns() { + Set 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; + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index ec3afd3b..3590f2d5 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -9,17 +9,25 @@ 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.Decision; +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 +70,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 ervu_dashboard.databasechangelog. */ @@ -72,6 +90,17 @@ public class ErvuDashboard extends SchemaImpl { */ public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public final Decision DECISION = Decision.DECISION; + + /** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами + * на участие в выборах + */ + public final Deputy DEPUTY = Deputy.DEPUTY; + /** * сведения об инвалидности/недееспособности/ограниченной дееспособности */ @@ -92,23 +121,38 @@ 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 ervu_dashboard.pub_recruitment. */ public final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT; + /** + * сведения об уголовном преследовании и вынесенном приговоре + */ + public final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** * The table ervu_dashboard.recruitment. */ public final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public final Subpoena SUBPOENA = Subpoena.SUBPOENA; @@ -117,6 +161,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 +186,25 @@ public class ErvuDashboard extends SchemaImpl { CitizenChild.CITIZEN_CHILD, CitizenGuardianship.CITIZEN_GUARDIANSHIP, CitizenSpouse.CITIZEN_SPOUSE, + Citizenship.CITIZENSHIP, + CitizenshipForeign.CITIZENSHIP_FOREIGN, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, + Decision.DECISION, + 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 ); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 55bf1a92..b2010943 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -8,30 +8,46 @@ 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.Decision; +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.DecisionRecord; +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 +70,23 @@ public class Keys { public static final UniqueKey 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 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 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 PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true); + public static final UniqueKey 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 DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); + public static final UniqueKey DECISION_PKEY = Internal.createUniqueKey(Decision.DECISION, DSL.name("decision_pkey"), new TableField[] { Decision.DECISION.DECISION_ID }, true); + public static final UniqueKey PK_DEPUTY = Internal.createUniqueKey(Deputy.DEPUTY, DSL.name("pk_deputy"), new TableField[] { Deputy.DEPUTY.DEPUTY_ID }, true); public static final UniqueKey PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true); public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); public static final UniqueKey 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 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 PK_PASSPORT = Internal.createUniqueKey(Passport.PASSPORT, DSL.name("pk_passport"), new TableField[] { Passport.PASSPORT.PASSPORT_ID }, true); public static final UniqueKey PK_PROPERTY = Internal.createUniqueKey(Property.PROPERTY, DSL.name("pk_property"), new TableField[] { Property.PROPERTY.PROPERTY_ID }, true); + public static final UniqueKey PK_PROSECUTION = Internal.createUniqueKey(Prosecution.PROSECUTION, DSL.name("pk_prosecution"), new TableField[] { Prosecution.PROSECUTION.PROSECUTION_ID }, true); public static final UniqueKey PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final UniqueKey RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true); + public static final UniqueKey PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true); public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true); + public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUB_ID }, true); public static final UniqueKey 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 PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index b08f69c8..5472f66c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -8,17 +8,25 @@ 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.Decision; +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 +55,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 ervu_dashboard.databasechangelog. */ @@ -57,6 +75,17 @@ public class Tables { */ public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public static final Decision DECISION = Decision.DECISION; + + /** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами + * на участие в выборах + */ + public static final Deputy DEPUTY = Deputy.DEPUTY; + /** * сведения об инвалидности/недееспособности/ограниченной дееспособности */ @@ -77,23 +106,38 @@ 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 ervu_dashboard.pub_recruitment. */ public static final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT; + /** + * сведения об уголовном преследовании и вынесенном приговоре + */ + public static final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** * The table ervu_dashboard.recruitment. */ public static final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public static final Subpoena SUBPOENA = Subpoena.SUBPOENA; @@ -101,4 +145,9 @@ public class Tables { * The table ervu_dashboard.temporary_measures. */ public static final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES; + + /** + * сведения об имуществе + */ + public static final Work WORK = Work.WORK; } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java index 9d6cb5f5..c757b5ef 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java @@ -265,7 +265,7 @@ public class Citizen extends TableImpl { /** * The column ervu_dashboard.citizen.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.citizen.issue_date. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java new file mode 100644 index 00000000..24cfebed --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.citizenship + */ + public static final Citizenship CITIZENSHIP = new Citizenship(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return CitizenshipRecord.class; + } + + /** + * The column ervu_dashboard.citizenship.citizenship_id. + */ + public final TableField CITIZENSHIP_ID = createField(DSL.name("citizenship_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public final TableField ACQUIRING_BASIS = createField(DSL.name("acquiring_basis"), SQLDataType.CLOB, this, "основание приобретения гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public final TableField ACQUIRING_NUMBER = createField(DSL.name("acquiring_number"), SQLDataType.VARCHAR(20), this, "номер решения о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public final TableField ACQUIRING_DATE = createField(DSL.name("acquiring_date"), SQLDataType.DATE, this, "дата решения о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public final TableField ACQUIRING_AUTHORITY = createField(DSL.name("acquiring_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public final TableField RENUNCIATION_BASIS = createField(DSL.name("renunciation_basis"), SQLDataType.CLOB, this, "основание выхода гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_NUMBER = createField(DSL.name("renunciation_number"), SQLDataType.VARCHAR(20), this, "номер решения о выходе из гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_DATE = createField(DSL.name("renunciation_date"), SQLDataType.DATE, this, "дата решения о выходе из гражданства РФ"); + + /** + * The column + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_AUTHORITY = createField(DSL.name("renunciation_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о выходе из гражданства РФ"); + + private Citizenship(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Citizenship(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о гражданстве РФ"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.citizenship table reference + */ + public Citizenship(String alias) { + this(DSL.name(alias), CITIZENSHIP); + } + + /** + * Create an aliased ervu_dashboard.citizenship table reference + */ + public Citizenship(Name alias) { + this(alias, CITIZENSHIP); + } + + /** + * Create a ervu_dashboard.citizenship table reference + */ + public Citizenship() { + this(DSL.name("citizenship"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java new file mode 100644 index 00000000..1b42774c --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.citizenship_foreign + */ + public static final CitizenshipForeign CITIZENSHIP_FOREIGN = new CitizenshipForeign(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return CitizenshipForeignRecord.class; + } + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public final TableField CITIZENSHIP_FOREIGN_ID = createField(DSL.name("citizenship_foreign_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public final TableField COUNTRY_NAME = createField(DSL.name("country_name"), SQLDataType.VARCHAR(255), this, "наименование государства"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public final TableField RESIDENSE_RIGHT_BASIS = createField(DSL.name("residense_right_basis"), SQLDataType.VARCHAR(255), this, "основание получения права на постоянное проживание"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public final TableField RESIDENSE_RIGHT_DATE = createField(DSL.name("residense_right_date"), SQLDataType.DATE, this, "дата возникновения права на постоянное проживание"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public final TableField CITIZENSHIP_BASIS = createField(DSL.name("citizenship_basis"), SQLDataType.VARCHAR(255), this, "основание получения иностранного гражданства"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public final TableField CITIZENSHIP_DATE = createField(DSL.name("citizenship_date"), SQLDataType.DATE, this, "дата получения иностранного гражданства"); + + private CitizenshipForeign(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private CitizenshipForeign(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об иностранном гражданстве"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.citizenship_foreign table + * reference + */ + public CitizenshipForeign(String alias) { + this(DSL.name(alias), CITIZENSHIP_FOREIGN); + } + + /** + * Create an aliased ervu_dashboard.citizenship_foreign table + * reference + */ + public CitizenshipForeign(Name alias) { + this(alias, CITIZENSHIP_FOREIGN); + } + + /** + * Create a ervu_dashboard.citizenship_foreign table reference + */ + public CitizenshipForeign() { + this(DSL.name("citizenship_foreign"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java new file mode 100644 index 00000000..5887fdd5 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java @@ -0,0 +1,240 @@ +/* + * 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.DecisionRecord; + +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; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Decision extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.decision + */ + public static final Decision DECISION = new Decision(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DecisionRecord.class; + } + + /** + * The column ervu_dashboard.decision.decision_id. + */ + public final TableField DECISION_ID = createField(DSL.name("decision_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.decision.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruitment_id. + */ + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); + + private Decision(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Decision(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(String alias) { + this(DSL.name(alias), DECISION); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(Name alias) { + this(alias, DECISION); + } + + /** + * Create a ervu_dashboard.decision table reference + */ + public Decision() { + this(DSL.name("decision"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.DECISION_PKEY; + } + + @Override + public Decision as(String alias) { + return new Decision(DSL.name(alias), this); + } + + @Override + public Decision as(Name alias) { + return new Decision(alias, this); + } + + @Override + public Decision as(Table alias) { + return new Decision(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Decision rename(String name) { + return new Decision(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Name name) { + return new Decision(name, null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Table name) { + return new Decision(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition condition) { + return new Decision(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java new file mode 100644 index 00000000..f6c7ce5f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.deputy + */ + public static final Deputy DEPUTY = new Deputy(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DeputyRecord.class; + } + + /** + * The column ervu_dashboard.deputy.deputy_id. + */ + public final TableField DEPUTY_ID = createField(DSL.name("deputy_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public final TableField DEPUTY_ = createField(DSL.name("deputy"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "является депутатом(true)/кандидатом на участие в выборах(false)"); + + /** + * The column ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public final TableField INFORMATION = createField(DSL.name("information"), SQLDataType.CLOB, this, "сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах"); + + /** + * The column ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public final TableField END_DATE = createField(DSL.name("end_date"), SQLDataType.DATE, this, "дата досрочного прекращения полномочий/снятия кандидатуры с выборов"); + + /** + * The column ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public final TableField PERIOD_OFFICE = createField(DSL.name("period_office"), SQLDataType.VARCHAR(50), this, "срок полномочий"); + + /** + * The column ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public final TableField CANCELLATION_DATE = createField(DSL.name("cancellation_date"), SQLDataType.DATE, this, "дата аннулирования регистрации"); + + private Deputy(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Deputy(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.deputy table reference + */ + public Deputy(String alias) { + this(DSL.name(alias), DEPUTY); + } + + /** + * Create an aliased ervu_dashboard.deputy table reference + */ + public Deputy(Name alias) { + this(alias, DEPUTY); + } + + /** + * Create a ervu_dashboard.deputy table reference + */ + public Deputy() { + this(DSL.name("deputy"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java new file mode 100644 index 00000000..1847b92f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.passport + */ + public static final Passport PASSPORT = new Passport(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return PassportRecord.class; + } + + /** + * The column ervu_dashboard.passport.passport_id. + */ + public final TableField PASSPORT_ID = createField(DSL.name("passport_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public final TableField ACTUAL = createField(DSL.name("actual"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "статус документа: действительный(true)/недействительный(false)"); + + /** + * The column ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public final TableField PASSPORT_SERIES = createField(DSL.name("passport_series"), SQLDataType.VARCHAR(4), this, "серия паспорта"); + + /** + * The column ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public final TableField PASSPORT_NUMBER = createField(DSL.name("passport_number"), SQLDataType.VARCHAR(6), this, "номер паспорта"); + + /** + * The column ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public final TableField ISSUE_DATE = createField(DSL.name("issue_date"), SQLDataType.DATE, this, "дата выдачи документа"); + + /** + * The column ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public final TableField ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(255), this, "наименование органа, выдавшего документ"); + + /** + * The column ervu_dashboard.passport.unit_code. код + * подразделения + */ + public final TableField UNIT_CODE = createField(DSL.name("unit_code"), SQLDataType.VARCHAR(7), this, "код подразделения"); + + private Passport(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Passport(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о паспорте"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.passport table reference + */ + public Passport(String alias) { + this(DSL.name(alias), PASSPORT); + } + + /** + * Create an aliased ervu_dashboard.passport table reference + */ + public Passport(Name alias) { + this(alias, PASSPORT); + } + + /** + * Create a ervu_dashboard.passport table reference + */ + public Passport() { + this(DSL.name("passport"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java new file mode 100644 index 00000000..fa716ac8 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.prosecution + */ + public static final Prosecution PROSECUTION = new Prosecution(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ProsecutionRecord.class; + } + + /** + * The column ervu_dashboard.prosecution.prosecution_id. + */ + public final TableField PROSECUTION_ID = createField(DSL.name("prosecution_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public final TableField KIND = createField(DSL.name("kind"), SQLDataType.VARCHAR(255), this, "вид уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.DATE, this, "дата возбуждения уголовного дела"); + + /** + * The column ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public final TableField CLOSE_DATE = createField(DSL.name("close_date"), SQLDataType.DATE, this, "дата прекращения уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public final TableField AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование органа, принявшего решение"); + + /** + * The column ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public final TableField LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ"); + + /** + * The column ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public final TableField TERMINATION_BASIS = createField(DSL.name("termination_basis"), SQLDataType.VARCHAR(255), this, "основание прекращения уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public final TableField TRANSFER_TO_COURT = createField(DSL.name("transfer_to_court"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак передачи в суд уголовного дела в отношении гражданина"); + + /** + * The column ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public final TableField CASE_NUMBER = createField(DSL.name("case_number"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (предварительный)"); + + /** + * The column ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public final TableField CASE_NUMBER_COURT = createField(DSL.name("case_number_court"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (судебный)"); + + /** + * The column ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public final TableField RECLASSIFICATION = createField(DSL.name("reclassification"), SQLDataType.CLOB, this, "сведения о переквалификации деяния"); + + private Prosecution(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Prosecution(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.prosecution table reference + */ + public Prosecution(String alias) { + this(DSL.name(alias), PROSECUTION); + } + + /** + * Create an aliased ervu_dashboard.prosecution table reference + */ + public Prosecution(Name alias) { + this(alias, PROSECUTION); + } + + /** + * Create a ervu_dashboard.prosecution table reference + */ + public Prosecution() { + this(DSL.name("prosecution"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java new file mode 100644 index 00000000..60bb1f3c --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.punishment + */ + public static final Punishment PUNISHMENT = new Punishment(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return PunishmentRecord.class; + } + + /** + * The column ervu_dashboard.punishment.punishment_id. + */ + public final TableField PUNISHMENT_ID = createField(DSL.name("punishment_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public final TableField SENTENCE = createField(DSL.name("sentence"), SQLDataType.VARCHAR(255), this, "срок или размер наказания"); + + /** + * The column ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public final TableField SENTENCE_CHANGED = createField(DSL.name("sentence_changed"), SQLDataType.VARCHAR(255), this, "изменение срока или размера наказания"); + + /** + * The column ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public final TableField SENTENSE_DATE = createField(DSL.name("sentense_date"), SQLDataType.DATE, this, "дата вынесения обвинительного приговора"); + + /** + * The column ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public final TableField AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование суда, вынесшего приговор"); + + /** + * The column ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public final TableField LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ"); + + /** + * The column ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public final TableField PUNISHMENT_TYPE = createField(DSL.name("punishment_type"), SQLDataType.VARCHAR(100), this, "вид наказания"); + + /** + * The column ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public final TableField PUNISHMENT_CODE = createField(DSL.name("punishment_code"), SQLDataType.VARCHAR(5), this, "код вида наказания"); + + /** + * The column ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public final TableField SENTENCE_PLACE = createField(DSL.name("sentence_place"), SQLDataType.CLOB, this, "наименование и адрес места отбывания наказания"); + + /** + * The column ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public final TableField START_DATE = createField(DSL.name("start_date"), SQLDataType.DATE, this, "дата начала срока отбывания наказания"); + + /** + * The column ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public final TableField PLANNED_DATE = createField(DSL.name("planned_date"), SQLDataType.DATE, this, "плановая дата отбытия"); + + /** + * The column ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public final TableField RELEASE_DATE = createField(DSL.name("release_date"), SQLDataType.DATE, this, "дата освобождения"); + + /** + * The column ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public final TableField RELEASE_REASON = createField(DSL.name("release_reason"), SQLDataType.VARCHAR(255), this, "основание освобождения"); + + /** + * The column ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public final TableField MANDATORY_WORK = createField(DSL.name("mandatory_work"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак отбывания наказания в виде обязательных работ"); + + private Punishment(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Punishment(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании и вынесенном приговоре"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.punishment table reference + */ + public Punishment(String alias) { + this(DSL.name(alias), PUNISHMENT); + } + + /** + * Create an aliased ervu_dashboard.punishment table reference + */ + public Punishment(Name alias) { + this(alias, PUNISHMENT); + } + + /** + * Create a ervu_dashboard.punishment table reference + */ + public Punishment() { + this(DSL.name("punishment"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java index 8a8b9a66..daf2477c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java @@ -9,10 +9,10 @@ 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; +import java.util.UUID; import org.jooq.Condition; import org.jooq.Field; @@ -71,7 +71,7 @@ public class Recruitment extends TableImpl { /** * The column ervu_dashboard.recruitment.idm_id. */ - public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.VARCHAR(36), this, ""); + public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.recruitment.code. @@ -189,19 +189,6 @@ public class Recruitment extends TableImpl { return _conscriptionInfo; } - private transient AppealsPath _appeals; - - /** - * Get the implicit to-many join path to the - * recruitment_campaign.appeals 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; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java index 55c9acf3..31870fa8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java @@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Subpoena extends TableImpl { @@ -53,66 +53,153 @@ public class Subpoena extends TableImpl { } /** - * The column ervu_dashboard.subpoena.subpoena_id. + * The column ervu_dashboard.subpoena.sub_id. */ - public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + public final TableField SUB_ID = createField(DSL.name("sub_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); /** - * The column ervu_dashboard.subpoena.series. + * The column ervu_dashboard.subpoena.series. серия повестки */ - public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, ""); + public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, "серия повестки"); /** - * The column ervu_dashboard.subpoena.number. + * The column ervu_dashboard.subpoena.number. номер повестки */ - public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, ""); + public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, "номер повестки"); /** - * The column ervu_dashboard.subpoena.create_date. + * The column ervu_dashboard.subpoena.create_date. дата + * создания записи */ - public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, ""); + public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, "дата создания записи"); /** - * The column ervu_dashboard.subpoena.visit_date. + * The column ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ - public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, "время и дата явки в ВК"); /** - * The column ervu_dashboard.subpoena.send_date. + * The column ervu_dashboard.subpoena.send_date. дата + * направления повестки */ - public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, "дата направления повестки"); /** - * The column ervu_dashboard.subpoena.reason_cancelled. + * The column ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ - public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, ""); + public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, "причина отклонения повестки"); /** - * The column ervu_dashboard.subpoena.recruit_id. + * The column ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ - public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, "идентификатор рекрута"); /** * The column ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ - public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, ""); + public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, "идентификатор ВК"); /** - * The column ervu_dashboard.subpoena.subpoena_status. + * The column ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ - public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, "статус повестки"); /** - * The column ervu_dashboard.subpoena.subpoena_reason. + * The column ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ - public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, "причина вызова по повестке"); + + /** + * The column ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public final TableField FIO_COMMISS = createField(DSL.name("fio_commiss"), SQLDataType.CLOB, this, "фио комиссара"); + + /** + * The column ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public final TableField TRACK_NUMBER = createField(DSL.name("track_number"), SQLDataType.CLOB, this, "уникальный номер заказного почтового отправления, которым направлена повестка"); + + /** + * The column ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК, направившего повестку"); + + /** + * The column ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public final TableField ADDRESS = createField(DSL.name("address"), SQLDataType.CLOB, this, "адрес, по которому нужно явиться по повестке"); + + /** + * The column ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public final TableField METHOD_SENDING = createField(DSL.name("method_sending"), SQLDataType.CLOB, this, "способ направления повестки"); + + /** + * The column ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, "идентификатор повестки"); + + /** + * The column ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public final TableField SIG_INFO = createField(DSL.name("sig_info"), SQLDataType.VARCHAR(255), this, "открепленная ЭП"); + + /** + * The column ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public final TableField DELIVERY_FIO = createField(DSL.name("delivery_fio"), SQLDataType.CLOB, this, "фио лица, оповестившего гражданина о последствиях отказа от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public final TableField ACT_NUMBER = createField(DSL.name("act_number"), SQLDataType.CLOB, this, "номер акта об отказе от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public final TableField METHOD_DELIVERY = createField(DSL.name("method_delivery"), SQLDataType.CLOB, this, "способ вручения"); + + /** + * The column ervu_dashboard.subpoena.delivery_date. + */ + public final TableField DELIVERY_DATE = createField(DSL.name("delivery_date"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column ervu_dashboard.subpoena.delivery_status. + */ + public final TableField DELIVERY_STATUS = createField(DSL.name("delivery_status"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance. + */ + public final TableField APPEARANCE = createField(DSL.name("appearance"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance_status. + */ + public final TableField APPEARANCE_STATUS = createField(DSL.name("appearance_status"), SQLDataType.CLOB, this, ""); private Subpoena(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } private Subpoena(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + super(alias, null, aliased, parameters, DSL.comment("сведения о направлении повестки военного комиссариата"), TableOptions.table(), where); } /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java index 4c6e2ba0..a2d50051 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java @@ -8,7 +8,7 @@ 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.TemporaryMeasuresRecord; -import java.sql.Date; +import java.sql.Timestamp; import java.util.Collection; import java.util.UUID; @@ -58,37 +58,86 @@ public class TemporaryMeasures extends TableImpl { */ public final TableField TEMPORARY_MEASURES_ID = createField(DSL.name("temporary_measures_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + /** + * The column ervu_dashboard.temporary_measures.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.temporary_measures.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + /** * The column ervu_dashboard.temporary_measures.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** - * The column ervu_dashboard.temporary_measures.name. + * The column ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField STATUS_MEASURE = createField(DSL.name("status_measure"), SQLDataType.CLOB, this, "статус временной меры"); /** * The column - * ervu_dashboard.temporary_measures.date_application. + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public final TableField DATE_APPLICATION = createField(DSL.name("date_application"), SQLDataType.DATE.nullable(false), this, ""); + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК"); + + /** + * The column ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера + */ + public final TableField CANCEL_DATE = createField(DSL.name("cancel_date"), SQLDataType.TIMESTAMP(0), this, "дата, с которой отменена временная мера"); /** * The column - * ervu_dashboard.temporary_measures.withdrawal_date. + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры */ - public final TableField WITHDRAWAL_DATE = createField(DSL.name("withdrawal_date"), SQLDataType.DATE, this, ""); + public final TableField RESTRICTION_NAME = createField(DSL.name("restriction_name"), SQLDataType.CLOB, this, "наименование временной меры"); /** - * The column ervu_dashboard.temporary_measures.status. + * The column ervu_dashboard.temporary_measures.type. тип + * документа ограничения */ - public final TableField STATUS = createField(DSL.name("status"), SQLDataType.CHAR(100), this, ""); + public final TableField TYPE = createField(DSL.name("type"), SQLDataType.CLOB, this, "тип документа ограничения"); /** - * The column ervu_dashboard.temporary_measures.citizen_id. + * The column + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры */ - public final TableField CITIZEN_ID = createField(DSL.name("citizen_id"), SQLDataType.UUID, this, ""); + public final TableField DECISION_NUMBER_CREATE = createField(DSL.name("decision_number_create"), SQLDataType.CLOB, this, "номер решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public final TableField DECISION_NUMBER_CANCEL = createField(DSL.name("decision_number_cancel"), SQLDataType.CLOB, this, "номер решения об отмене временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public final TableField DECISION_DATE_CREATE = createField(DSL.name("decision_date_create"), SQLDataType.TIMESTAMP(0), this, "дата решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public final TableField DECISION_DATE_CANCEL = createField(DSL.name("decision_date_cancel"), SQLDataType.TIMESTAMP(0), this, "дата решения об отмене временной меры"); + + /** + * The column ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public final TableField APPLIED_FACT = createField(DSL.name("applied_fact"), SQLDataType.CLOB, this, "факт применения временной меры"); private TemporaryMeasures(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java new file mode 100644 index 00000000..f9360b1b --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.work + */ + public static final Work WORK = new Work(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return WorkRecord.class; + } + + /** + * The column ervu_dashboard.work.work_id. + */ + public final TableField WORK_ID = createField(DSL.name("work_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public final TableField EMPLOYER_CATEGORY = createField(DSL.name("employer_category"), SQLDataType.VARCHAR.asEnumDataType(EmployerCategoryType.class), this, "категория работодателя: юр лицо/ИП/физ лицо/глава КФХ"); + + /** + * The column ervu_dashboard.work.place. место работы + */ + public final TableField PLACE = createField(DSL.name("place"), SQLDataType.CLOB, this, "место работы"); + + /** + * The column ervu_dashboard.work.organization_name. + * наименование организации + */ + public final TableField ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(100), this, "наименование организации"); + + /** + * The column ervu_dashboard.work.inn. ИНН + */ + public final TableField INN = createField(DSL.name("inn"), SQLDataType.VARCHAR(15), this, "ИНН"); + + /** + * The column ervu_dashboard.work.kpp. КПП + */ + public final TableField KPP = createField(DSL.name("kpp"), SQLDataType.VARCHAR(15), this, "КПП"); + + /** + * The column ervu_dashboard.work.ogrnip. ОГРНИП + */ + public final TableField OGRNIP = createField(DSL.name("ogrnip"), SQLDataType.VARCHAR(20), this, "ОГРНИП"); + + /** + * The column ervu_dashboard.work.position. должность + */ + public final TableField POSITION = createField(DSL.name("position"), SQLDataType.VARCHAR(150), this, "должность"); + + /** + * The column ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public final TableField EVENT_TYPE = createField(DSL.name("event_type"), SQLDataType.VARCHAR(50), this, "тип кадрового мероприятия "); + + /** + * The column ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public final TableField EVENT_DATE = createField(DSL.name("event_date"), SQLDataType.DATE, this, "дата кадрового мероприятия"); + + private Work(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Work(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об имуществе"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.work table reference + */ + public Work(String alias) { + this(DSL.name(alias), WORK); + } + + /** + * Create an aliased ervu_dashboard.work table reference + */ + public Work(Name alias) { + this(alias, WORK); + } + + /** + * Create a ervu_dashboard.work table reference + */ + public Work() { + this(DSL.name("work"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey 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 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 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)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java index 0e483a65..4c9c553c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java @@ -593,15 +593,15 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.citizen.recruitment_id. */ - public void setRecruitmentId(String value) { + public void setRecruitmentId(UUID value) { set(37, value); } /** * Getter for ervu_dashboard.citizen.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(37); + public UUID getRecruitmentId() { + return (UUID) get(37); } /** @@ -655,7 +655,7 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Create a detached, initialised CitizenRecord */ - public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, String recruitmentId, Date issueDate, BigDecimal numberChildren_18Old) { + public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old) { super(Citizen.CITIZEN); setResidence(residence); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java new file mode 100644 index 00000000..cf6cfd78 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public void setCitizenshipForeignId(Long value) { + set(0, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public Long getCitizenshipForeignId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public void setCountryName(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public String getCountryName() { + return (String) get(2); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public void setResidenseRightBasis(String value) { + set(3, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public String getResidenseRightBasis() { + return (String) get(3); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public void setResidenseRightDate(Date value) { + set(4, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public Date getResidenseRightDate() { + return (Date) get(4); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public void setCitizenshipBasis(String value) { + set(5, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public String getCitizenshipBasis() { + return (String) get(5); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public void setCitizenshipDate(Date value) { + set(6, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public Date getCitizenshipDate() { + return (Date) get(6); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java new file mode 100644 index 00000000..b1baef0f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.citizenship.citizenship_id. + */ + public void setCitizenshipId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.citizenship.citizenship_id. + */ + public Long getCitizenshipId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public void setAcquiringBasis(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public String getAcquiringBasis() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public void setAcquiringNumber(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public String getAcquiringNumber() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public void setAcquiringDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public Date getAcquiringDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public void setAcquiringAuthority(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public String getAcquiringAuthority() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public void setRenunciationBasis(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public String getRenunciationBasis() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public void setRenunciationNumber(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public String getRenunciationNumber() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public void setRenunciationDate(Date value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public Date getRenunciationDate() { + return (Date) get(8); + } + + /** + * Setter for + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public void setRenunciationAuthority(String value) { + set(9, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public String getRenunciationAuthority() { + return (String) get(9); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java new file mode 100644 index 00000000..8d0fd5e0 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java @@ -0,0 +1,111 @@ +/* + * 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.Decision; + +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DecisionRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.decision.decision_id. + */ + public void setDecisionId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.decision.decision_id. + */ + public Long getDecisionId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.decision.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.decision.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.decision.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.decision.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + + /** + * Setter for ervu_dashboard.decision.recruitment_id. + */ + public void setRecruitmentId(UUID value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.decision.recruitment_id. + */ + public UUID getRecruitmentId() { + return (UUID) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DecisionRecord + */ + public DecisionRecord() { + super(Decision.DECISION); + } + + /** + * Create a detached, initialised DecisionRecord + */ + public DecisionRecord(Long decisionId, UUID subpoenaId, UUID recruitId, UUID recruitmentId) { + super(Decision.DECISION); + + setDecisionId(decisionId); + setSubpoenaId(subpoenaId); + setRecruitId(recruitId); + setRecruitmentId(recruitmentId); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java new file mode 100644 index 00000000..10d5d8d4 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.deputy.deputy_id. + */ + public void setDeputyId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.deputy.deputy_id. + */ + public Long getDeputyId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public void setDeputy(Boolean value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public Boolean getDeputy() { + return (Boolean) get(2); + } + + /** + * Setter for ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public void setInformation(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public String getInformation() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public void setEndDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public Date getEndDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public void setPeriodOffice(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public String getPeriodOffice() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public void setCancellationDate(Date value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public Date getCancellationDate() { + return (Date) get(6); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java new file mode 100644 index 00000000..9d8b5e03 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.passport.passport_id. + */ + public void setPassportId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_id. + */ + public Long getPassportId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public void setActual(Boolean value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public Boolean getActual() { + return (Boolean) get(2); + } + + /** + * Setter for ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public void setPassportSeries(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public String getPassportSeries() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public void setPassportNumber(String value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public String getPassportNumber() { + return (String) get(4); + } + + /** + * Setter for ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public void setIssueDate(Date value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public Date getIssueDate() { + return (Date) get(5); + } + + /** + * Setter for ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public void setOrganizationName(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public String getOrganizationName() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.passport.unit_code. код + * подразделения + */ + public void setUnitCode(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.passport.unit_code. код + * подразделения + */ + public String getUnitCode() { + return (String) get(7); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java new file mode 100644 index 00000000..e7fe56d7 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.prosecution.prosecution_id. + */ + public void setProsecutionId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.prosecution.prosecution_id. + */ + public Long getProsecutionId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public void setKind(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public String getKind() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public void setCreateDate(Date value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public Date getCreateDate() { + return (Date) get(3); + } + + /** + * Setter for ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public void setCloseDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public Date getCloseDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public void setAuthorityName(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public String getAuthorityName() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public void setLawPoint(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public String getLawPoint() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public void setTerminationBasis(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public String getTerminationBasis() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public void setTransferToCourt(Boolean value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public Boolean getTransferToCourt() { + return (Boolean) get(8); + } + + /** + * Setter for ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public void setCaseNumber(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public String getCaseNumber() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public void setCaseNumberCourt(String value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public String getCaseNumberCourt() { + return (String) get(10); + } + + /** + * Setter for ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public void setReclassification(String value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public String getReclassification() { + return (String) get(11); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java new file mode 100644 index 00000000..9c729f3d --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java @@ -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 { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.punishment.punishment_id. + */ + public void setPunishmentId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_id. + */ + public Long getPunishmentId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public void setSentence(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public String getSentence() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public void setSentenceChanged(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public String getSentenceChanged() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public void setSentenseDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public Date getSentenseDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public void setAuthorityName(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public String getAuthorityName() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public void setLawPoint(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public String getLawPoint() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public void setPunishmentType(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public String getPunishmentType() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public void setPunishmentCode(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public String getPunishmentCode() { + return (String) get(8); + } + + /** + * Setter for ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public void setSentencePlace(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public String getSentencePlace() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public void setStartDate(Date value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public Date getStartDate() { + return (Date) get(10); + } + + /** + * Setter for ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public void setPlannedDate(Date value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public Date getPlannedDate() { + return (Date) get(11); + } + + /** + * Setter for ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public void setReleaseDate(Date value) { + set(12, value); + } + + /** + * Getter for ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public Date getReleaseDate() { + return (Date) get(12); + } + + /** + * Setter for ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public void setReleaseReason(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public String getReleaseReason() { + return (String) get(13); + } + + /** + * Setter for ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public void setMandatoryWork(Boolean value) { + set(14, value); + } + + /** + * Getter for ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public Boolean getMandatoryWork() { + return (Boolean) get(14); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java index c40726dc..8a7ae183 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java @@ -6,6 +6,8 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; +import java.util.UUID; + import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -49,15 +51,15 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.recruitment.idm_id. */ - public void setIdmId(String value) { + public void setIdmId(UUID value) { set(2, value); } /** * Getter for ervu_dashboard.recruitment.idm_id. */ - public String getIdmId() { - return (String) get(2); + public UUID getIdmId() { + return (UUID) get(2); } /** @@ -125,7 +127,7 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Create a detached, initialised RecruitmentRecord */ - public RecruitmentRecord(String id, String shortname, String idmId, String code, String parentId, Long sort) { + public RecruitmentRecord(String id, String shortname, UUID idmId, String code, String parentId, Long sort) { super(Recruitment.RECRUITMENT); setId(id); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java index 61ab235f..ecae847d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class SubpoenaRecord extends UpdatableRecordImpl { @@ -22,112 +22,122 @@ public class SubpoenaRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; /** - * Setter for ervu_dashboard.subpoena.subpoena_id. + * Setter for ervu_dashboard.subpoena.sub_id. */ - public void setSubpoenaId(Long value) { + public void setSubId(Long value) { set(0, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_id. + * Getter for ervu_dashboard.subpoena.sub_id. */ - public Long getSubpoenaId() { + public Long getSubId() { return (Long) get(0); } /** - * Setter for ervu_dashboard.subpoena.series. + * Setter for ervu_dashboard.subpoena.series. серия повестки */ public void setSeries(String value) { set(1, value); } /** - * Getter for ervu_dashboard.subpoena.series. + * Getter for ervu_dashboard.subpoena.series. серия повестки */ public String getSeries() { return (String) get(1); } /** - * Setter for ervu_dashboard.subpoena.number. + * Setter for ervu_dashboard.subpoena.number. номер повестки */ public void setNumber(String value) { set(2, value); } /** - * Getter for ervu_dashboard.subpoena.number. + * Getter for ervu_dashboard.subpoena.number. номер повестки */ public String getNumber() { return (String) get(2); } /** - * Setter for ervu_dashboard.subpoena.create_date. + * Setter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public void setCreateDate(Timestamp value) { set(3, value); } /** - * Getter for ervu_dashboard.subpoena.create_date. + * Getter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public Timestamp getCreateDate() { return (Timestamp) get(3); } /** - * Setter for ervu_dashboard.subpoena.visit_date. + * Setter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public void setVisitDate(Timestamp value) { set(4, value); } /** - * Getter for ervu_dashboard.subpoena.visit_date. + * Getter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public Timestamp getVisitDate() { return (Timestamp) get(4); } /** - * Setter for ervu_dashboard.subpoena.send_date. + * Setter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public void setSendDate(Timestamp value) { set(5, value); } /** - * Getter for ervu_dashboard.subpoena.send_date. + * Getter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public Timestamp getSendDate() { return (Timestamp) get(5); } /** - * Setter for ervu_dashboard.subpoena.reason_cancelled. + * Setter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public void setReasonCancelled(String value) { set(6, value); } /** - * Getter for ervu_dashboard.subpoena.reason_cancelled. + * Getter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public String getReasonCancelled() { return (String) get(6); } /** - * Setter for ervu_dashboard.subpoena.recruit_id. + * Setter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public void setRecruitId(UUID value) { set(7, value); } /** - * Getter for ervu_dashboard.subpoena.recruit_id. + * Getter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public UUID getRecruitId() { return (UUID) get(7); @@ -135,6 +145,7 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public void setDepartmentId(UUID value) { set(8, value); @@ -142,39 +153,258 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Getter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public UUID getDepartmentId() { return (UUID) get(8); } /** - * Setter for ervu_dashboard.subpoena.subpoena_status. + * Setter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public void setSubpoenaStatus(String value) { set(9, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_status. + * Getter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public String getSubpoenaStatus() { return (String) get(9); } /** - * Setter for ervu_dashboard.subpoena.subpoena_reason. + * Setter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public void setSubpoenaReason(String value) { set(10, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_reason. + * Getter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public String getSubpoenaReason() { return (String) get(10); } + /** + * Setter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public void setFioCommiss(String value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public String getFioCommiss() { + return (String) get(11); + } + + /** + * Setter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public void setTrackNumber(String value) { + set(12, value); + } + + /** + * Getter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public String getTrackNumber() { + return (String) get(12); + } + + /** + * Setter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public void setRecruitmentName(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public String getRecruitmentName() { + return (String) get(13); + } + + /** + * Setter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public void setAddress(String value) { + set(14, value); + } + + /** + * Getter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public String getAddress() { + return (String) get(14); + } + + /** + * Setter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public void setMethodSending(String value) { + set(15, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public String getMethodSending() { + return (String) get(15); + } + + /** + * Setter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public void setSubpoenaId(UUID value) { + set(16, value); + } + + /** + * Getter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public UUID getSubpoenaId() { + return (UUID) get(16); + } + + /** + * Setter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public void setSigInfo(String value) { + set(17, value); + } + + /** + * Getter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public String getSigInfo() { + return (String) get(17); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public void setDeliveryFio(String value) { + set(18, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public String getDeliveryFio() { + return (String) get(18); + } + + /** + * Setter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public void setActNumber(String value) { + set(19, value); + } + + /** + * Getter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public String getActNumber() { + return (String) get(19); + } + + /** + * Setter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public void setMethodDelivery(String value) { + set(20, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public String getMethodDelivery() { + return (String) get(20); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_date. + */ + public void setDeliveryDate(Timestamp value) { + set(21, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_date. + */ + public Timestamp getDeliveryDate() { + return (Timestamp) get(21); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_status. + */ + public void setDeliveryStatus(String value) { + set(22, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_status. + */ + public String getDeliveryStatus() { + return (String) get(22); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance. + */ + public void setAppearance(String value) { + set(23, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance. + */ + public String getAppearance() { + return (String) get(23); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance_status. + */ + public void setAppearanceStatus(String value) { + set(24, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance_status. + */ + public String getAppearanceStatus() { + return (String) get(24); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -198,10 +428,10 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenaRecord */ - public SubpoenaRecord(Long subpoenaId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason) { + public SubpoenaRecord(Long subId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason, String fioCommiss, String trackNumber, String recruitmentName, String address, String methodSending, UUID subpoenaId, String sigInfo, String deliveryFio, String actNumber, String methodDelivery, Timestamp deliveryDate, String deliveryStatus, String appearance, String appearanceStatus) { super(Subpoena.SUBPOENA); - setSubpoenaId(subpoenaId); + setSubId(subId); setSeries(series); setNumber(number); setCreateDate(createDate); @@ -212,6 +442,20 @@ public class SubpoenaRecord extends UpdatableRecordImpl { setDepartmentId(departmentId); setSubpoenaStatus(subpoenaStatus); setSubpoenaReason(subpoenaReason); + setFioCommiss(fioCommiss); + setTrackNumber(trackNumber); + setRecruitmentName(recruitmentName); + setAddress(address); + setMethodSending(methodSending); + setSubpoenaId(subpoenaId); + setSigInfo(sigInfo); + setDeliveryFio(deliveryFio); + setActNumber(actNumber); + setMethodDelivery(methodDelivery); + setDeliveryDate(deliveryDate); + setDeliveryStatus(deliveryStatus); + setAppearance(appearance); + setAppearanceStatus(appearanceStatus); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java index 63dcb70c..3cd87b39 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java @@ -6,7 +6,7 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; -import java.sql.Date; +import java.sql.Timestamp; import java.util.UUID; import org.jooq.Record1; @@ -37,92 +37,218 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImplervu_dashboard.temporary_measures.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.temporary_measures.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + /** * Setter for ervu_dashboard.temporary_measures.recruitment_id. */ - public void setRecruitmentId(String value) { - set(1, value); + public void setRecruitmentId(UUID value) { + set(3, value); } /** * Getter for ervu_dashboard.temporary_measures.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(1); + public UUID getRecruitmentId() { + return (UUID) get(3); } /** - * Setter for ervu_dashboard.temporary_measures.name. + * Setter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public void setName(String value) { - set(2, value); - } - - /** - * Getter for ervu_dashboard.temporary_measures.name. - */ - public String getName() { - return (String) get(2); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.date_application. - */ - public void setDateApplication(Date value) { - set(3, value); - } - - /** - * Getter for - * ervu_dashboard.temporary_measures.date_application. - */ - public Date getDateApplication() { - return (Date) get(3); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.withdrawal_date. - */ - public void setWithdrawalDate(Date value) { + public void setStatusMeasure(String value) { set(4, value); } /** - * Getter for - * ervu_dashboard.temporary_measures.withdrawal_date. + * Getter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public Date getWithdrawalDate() { - return (Date) get(4); + public String getStatusMeasure() { + return (String) get(4); } /** - * Setter for ervu_dashboard.temporary_measures.status. + * Setter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public void setStatus(String value) { + public void setRecruitmentName(String value) { set(5, value); } /** - * Getter for ervu_dashboard.temporary_measures.status. + * Getter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public String getStatus() { + public String getRecruitmentName() { return (String) get(5); } /** - * Setter for ervu_dashboard.temporary_measures.citizen_id. + * Setter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public void setCitizenId(UUID value) { + public void setCancelDate(Timestamp value) { set(6, value); } /** - * Getter for ervu_dashboard.temporary_measures.citizen_id. + * Getter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public UUID getCitizenId() { - return (UUID) get(6); + public Timestamp getCancelDate() { + return (Timestamp) get(6); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public void setRestrictionName(String value) { + set(7, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public String getRestrictionName() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public void setType(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public String getType() { + return (String) get(8); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public void setDecisionNumberCreate(String value) { + set(9, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public String getDecisionNumberCreate() { + return (String) get(9); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public void setDecisionNumberCancel(String value) { + set(10, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public String getDecisionNumberCancel() { + return (String) get(10); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public void setDecisionDateCreate(Timestamp value) { + set(11, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public Timestamp getDecisionDateCreate() { + return (Timestamp) get(11); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public void setDecisionDateCancel(Timestamp value) { + set(12, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public Timestamp getDecisionDateCancel() { + return (Timestamp) get(12); + } + + /** + * Setter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public void setAppliedFact(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public String getAppliedFact() { + return (String) get(13); } // ------------------------------------------------------------------------- @@ -148,16 +274,23 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.work.work_id. + */ + public void setWorkId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.work.work_id. + */ + public Long getWorkId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public void setEmployerCategory(EmployerCategoryType value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public EmployerCategoryType getEmployerCategory() { + return (EmployerCategoryType) get(2); + } + + /** + * Setter for ervu_dashboard.work.place. место работы + */ + public void setPlace(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.work.place. место работы + */ + public String getPlace() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.work.organization_name. + * наименование организации + */ + public void setOrganizationName(String value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.work.organization_name. + * наименование организации + */ + public String getOrganizationName() { + return (String) get(4); + } + + /** + * Setter for ervu_dashboard.work.inn. ИНН + */ + public void setInn(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.work.inn. ИНН + */ + public String getInn() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.work.kpp. КПП + */ + public void setKpp(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.work.kpp. КПП + */ + public String getKpp() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.work.ogrnip. ОГРНИП + */ + public void setOgrnip(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.work.ogrnip. ОГРНИП + */ + public String getOgrnip() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.work.position. должность + */ + public void setPosition(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.work.position. должность + */ + public String getPosition() { + return (String) get(8); + } + + /** + * Setter for ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public void setEventType(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public String getEventType() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public void setEventDate(Date value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public Date getEventDate() { + return (Date) get(10); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 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(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java new file mode 100644 index 00000000..46cc5b28 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java @@ -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 + * null, 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); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/Keys.java index c957a0d1..89a38c48 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/Keys.java @@ -31,7 +31,7 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- - public static final UniqueKey PK_APPEAL = Internal.createUniqueKey(Appeals.APPEALS, DSL.name("pk_appeal"), new TableField[] { Appeals.APPEALS.ID_APPEAL }, true); + public static final UniqueKey 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 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 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 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 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); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java index 9b3657c3..c372d5e9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java @@ -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 { } /** - * The column recruitment_campaign.appeals.id_appeal. - */ - public final TableField ID_APPEAL = createField(DSL.name("id_appeal"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); - - /** - * The column recruitment_campaign.appeals.total_appeal. + * The column recruitment_campaign.appeals.total_appeals. * Получено жалоб */ - public final TableField TOTAL_APPEAL = createField(DSL.name("total_appeal"), SQLDataType.NUMERIC, this, "Получено жалоб"); + public final TableField TOTAL_APPEALS = createField(DSL.name("total_appeals"), SQLDataType.NUMERIC, this, "Получено жалоб"); /** * The column recruitment_campaign.appeals.resolved. Решено @@ -98,7 +85,7 @@ public class Appeals extends TableImpl { * The column recruitment_campaign.appeals.recording_date. Дата * записи */ - public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи"); + public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи"); /** * The column recruitment_campaign.appeals.resolved_percent. @@ -116,12 +103,12 @@ public class Appeals extends TableImpl { /** * The column recruitment_campaign.appeals.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, ""); /** - * The column recruitment_campaign.appeals.testspring_autumn. + * The column recruitment_campaign.appeals.spring_autumn. */ - public final TableField TESTSPRING_AUTUMN = createField(DSL.name("testspring_autumn"), SQLDataType.CHAR(36), this, ""); + public final TableField SPRING_AUTUMN = createField(DSL.name("spring_autumn"), SQLDataType.VARCHAR.nullable(false), this, ""); private Appeals(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -154,68 +141,14 @@ public class Appeals extends TableImpl { this(DSL.name("appeals"), null); } - public Appeals(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, APPEALS); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class AppealsPath extends Appeals implements Path { - public AppealsPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private AppealsPath(Name alias, Table 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 getIdentity() { - return (Identity) super.getIdentity(); - } - @Override public UniqueKey getPrimaryKey() { - return Keys.PK_APPEAL; - } - - @Override - public List> getReferences() { - return Arrays.asList(Keys.APPEALS__RC_APPEALS_FK1); - } - - private transient RecruitmentPath _recruitment; - - /** - * Get the implicit join path to the ervu_dashboard.recruitment - * table. - */ - public RecruitmentPath recruitment() { - if (_recruitment == null) - _recruitment = new RecruitmentPath(this, Keys.APPEALS__RC_APPEALS_FK1, null); - - return _recruitment; + return Keys.APPEALS_PKEY; } @Override diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java index 5bd16443..081752a8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java @@ -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 { private static final long serialVersionUID = 1L; /** - * Setter for recruitment_campaign.appeals.id_appeal. + * Setter for recruitment_campaign.appeals.total_appeals. + * Получено жалоб */ - public void setIdAppeal(Long value) { + public void setTotalAppeals(BigDecimal value) { set(0, value); } /** - * Getter for recruitment_campaign.appeals.id_appeal. - */ - public Long getIdAppeal() { - return (Long) get(0); - } - - /** - * Setter for recruitment_campaign.appeals.total_appeal. + * Getter for recruitment_campaign.appeals.total_appeals. * Получено жалоб */ - public void setTotalAppeal(BigDecimal value) { - set(1, value); - } - - /** - * Getter for recruitment_campaign.appeals.total_appeal. - * Получено жалоб - */ - public BigDecimal getTotalAppeal() { - return (BigDecimal) get(1); + public BigDecimal getTotalAppeals() { + return (BigDecimal) get(0); } /** * Setter for recruitment_campaign.appeals.resolved. Решено */ public void setResolved(BigDecimal value) { - set(2, value); + set(1, value); } /** * Getter for recruitment_campaign.appeals.resolved. Решено */ public BigDecimal getResolved() { - return (BigDecimal) get(2); + return (BigDecimal) get(1); } /** @@ -70,7 +56,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решено */ public void setNotResolved(BigDecimal value) { - set(3, value); + set(2, value); } /** @@ -78,7 +64,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решено */ public BigDecimal getNotResolved() { - return (BigDecimal) get(3); + return (BigDecimal) get(2); } /** @@ -87,7 +73,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решения */ public void setAverageConsideration(BigDecimal value) { - set(4, value); + set(3, value); } /** @@ -96,7 +82,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решения */ public BigDecimal getAverageConsideration() { - return (BigDecimal) get(4); + return (BigDecimal) get(3); } /** @@ -104,7 +90,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Оценка удовлетворенности */ public void setAverageRating(BigDecimal value) { - set(5, value); + set(4, value); } /** @@ -112,7 +98,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Оценка удовлетворенности */ public BigDecimal getAverageRating() { - return (BigDecimal) get(5); + return (BigDecimal) get(4); } /** @@ -120,7 +106,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * записи */ public void setRecordingDate(Date value) { - set(6, value); + set(5, value); } /** @@ -128,7 +114,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * записи */ public Date getRecordingDate() { - return (Date) get(6); + return (Date) get(5); } /** @@ -136,7 +122,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Процент решенных */ public void setResolvedPercent(BigDecimal value) { - set(7, value); + set(6, value); } /** @@ -144,7 +130,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Процент решенных */ public BigDecimal getResolvedPercent() { - return (BigDecimal) get(7); + return (BigDecimal) get(6); } /** @@ -153,7 +139,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * не решенных */ public void setNotResolvedPercent(BigDecimal value) { - set(8, value); + set(7, value); } /** @@ -162,44 +148,44 @@ public class AppealsRecord extends UpdatableRecordImpl { * не решенных */ public BigDecimal getNotResolvedPercent() { - return (BigDecimal) get(8); + return (BigDecimal) get(7); } /** * Setter for recruitment_campaign.appeals.recruitment_id. */ public void setRecruitmentId(String value) { - set(9, value); + set(8, value); } /** * Getter for recruitment_campaign.appeals.recruitment_id. */ public String getRecruitmentId() { + return (String) get(8); + } + + /** + * Setter for recruitment_campaign.appeals.spring_autumn. + */ + public void setSpringAutumn(String value) { + set(9, value); + } + + /** + * Getter for recruitment_campaign.appeals.spring_autumn. + */ + public String getSpringAutumn() { return (String) get(9); } - /** - * Setter for recruitment_campaign.appeals.testspring_autumn. - */ - public void setTestspringAutumn(String value) { - set(10, value); - } - - /** - * Getter for recruitment_campaign.appeals.testspring_autumn. - */ - public String getTestspringAutumn() { - return (String) get(10); - } - // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @Override - public Record1 key() { - return (Record1) super.key(); + public Record3 key() { + return (Record3) super.key(); } // ------------------------------------------------------------------------- @@ -216,11 +202,10 @@ public class AppealsRecord extends UpdatableRecordImpl { /** * 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 { setResolvedPercent(resolvedPercent); setNotResolvedPercent(notResolvedPercent); setRecruitmentId(recruitmentId); - setTestspringAutumn(testspringAutumn); + setSpringAutumn(springAutumn); resetChangedOnNotNull(); } } diff --git a/distribution/pom.xml b/distribution/pom.xml index 2f2915d7..17d80086 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/index.html b/frontend/index.html index d81cc685..22b58aa5 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,7 +1,7 @@ - ervu_dashboard + Дашборд diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index d2951109..e9aa8fe0 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -1,7 +1,7 @@ - ervu_dashboard + Дашборд diff --git a/frontend/pom.xml b/frontend/pom.xml index 69671412..81cf0eea 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/preview.html b/frontend/preview.html index 4bd5c4b0..6fe24323 100644 --- a/frontend/preview.html +++ b/frontend/preview.html @@ -1,7 +1,7 @@ - Web BPM + Дашборд diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 6dabc878..3e0a00b7 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -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; +} +*/ diff --git a/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss new file mode 100644 index 00000000..8d5a0252 --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss @@ -0,0 +1,9 @@ +label { + margin-bottom: 0; + cursor: pointer; +} + +.bi { + cursor: pointer; + margin-right: 0.3rem; +} diff --git a/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss new file mode 100644 index 00000000..c81c7542 --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss @@ -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; + } + } +} diff --git a/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss b/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss new file mode 100644 index 00000000..27e6358c --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss @@ -0,0 +1,9 @@ +:host { + display: block; + .treeview-item { + white-space: nowrap; + .treeview-item { + margin-left: 2rem; + } + } +} diff --git a/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss b/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss new file mode 100644 index 00000000..1047dd2e --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss @@ -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; +} diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index f5f582ed..bfdaeb63 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -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; diff --git a/frontend/src/resources/css/style.css b/frontend/src/resources/css/style.css index 03ed56df..36d68241 100644 --- a/frontend/src/resources/css/style.css +++ b/frontend/src/resources/css/style.css @@ -7,4 +7,8 @@ @import "../../../node_modules/@webbpm/base-package/css/style.css"; @import "structure.css"; @import "inbox-dashboard.css"; -@import "components-dashboard.css"; \ No newline at end of file +@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"; diff --git a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html new file mode 100644 index 00000000..a297b28f --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html @@ -0,0 +1,61 @@ + +
+ + +
+ + +
+
+ +
+
+
+
+ + +
+
+
+ + + diff --git a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html new file mode 100644 index 00000000..a42a65e5 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html @@ -0,0 +1,17 @@ +
+ +
+
+ + +
+
+
diff --git a/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html b/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html new file mode 100644 index 00000000..1be2f358 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html @@ -0,0 +1,16 @@ +
+ + +
+ + +
+
diff --git a/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html new file mode 100644 index 00000000..0bb0c872 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html @@ -0,0 +1,92 @@ + +
+ +
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+
+ +
+ + +
+
+
+ + +
+
+ {{i18n.getFilterNoItemsFoundText()}} +
+
diff --git a/frontend/src/resources/template/component/field/DropdownTreeView.html b/frontend/src/resources/template/component/field/DropdownTreeView.html new file mode 100644 index 00000000..abc6dd3f --- /dev/null +++ b/frontend/src/resources/template/component/field/DropdownTreeView.html @@ -0,0 +1,14 @@ +
+
+
+
+ + +
+
+
+
diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts new file mode 100644 index 00000000..f3cb3b85 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts @@ -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 : 'Элемент не выбран'; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts new file mode 100644 index 00000000..2f2762dd --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts @@ -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(); + @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); + } + } + } + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts new file mode 100644 index 00000000..3b235aa1 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts @@ -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(); + } + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts new file mode 100644 index 00000000..d41f85b0 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts @@ -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; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts new file mode 100644 index 00000000..b1f89fef --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts @@ -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; + @Input() itemTemplate: TemplateRef; + @Input() items: TreeviewItem[]; + @Input() config: TreeviewConfig; + @Output() selectedChange = new EventEmitter(true); + @Output() filterChange = new EventEmitter(); + @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); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts new file mode 100644 index 00000000..17d4f1ca --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts @@ -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(); + + @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); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts new file mode 100644 index 00000000..e15c43d9 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts @@ -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; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts new file mode 100644 index 00000000..8ea4ffcb --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts @@ -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; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts new file mode 100644 index 00000000..6b4f1eb6 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts @@ -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; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts new file mode 100644 index 00000000..cbd2a50a --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts @@ -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 + }; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts new file mode 100644 index 00000000..480ee696 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts @@ -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 ? 'Развернуть' : 'Свернуть'; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts new file mode 100644 index 00000000..dd32c50c --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts @@ -0,0 +1,7 @@ +import { TreeviewItem } from './treeview-item'; + +export interface TreeviewItemTemplateContext { + item: TreeviewItem; + onCollapseExpand: () => void; + onCheckedChange: () => void; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts new file mode 100644 index 00000000..82130bb3 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts @@ -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; + @Input() item: TreeviewItem; + @Output() checkedChange = new EventEmitter(); + + 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); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts new file mode 100644 index 00000000..30fde275 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts @@ -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; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts new file mode 100644 index 00000000..8e14e65a --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts @@ -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; + @Input() itemTemplate: TemplateRef; + @Input() items: TreeviewItem[]; + @Input() config: TreeviewConfig; + @Output() selectedChange = new EventEmitter(); + @Output() filterChange = new EventEmitter(); + 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; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts new file mode 100644 index 00000000..ca84acbd --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts @@ -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 } + ] + }; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts new file mode 100644 index 00000000..1aa4f6b3 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts @@ -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 })); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/utils.ts b/frontend/src/ts/component/external/ngx-treeview/lib/utils.ts new file mode 100644 index 00000000..d014b123 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/utils.ts @@ -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(); +}; diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts new file mode 100644 index 00000000..94274533 --- /dev/null +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -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 = new Event(); + + 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)) + } + } +} diff --git a/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts index 69b28a46..0548a46c 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts @@ -1,8 +1,8 @@ import {Behavior, TextFormatter} from "@webbpm/base-package"; -import {ReplaceValueModel} from "./model/ReplaceValueModel"; +import {ErvuReplaceValueModel} from "./model/ErvuReplaceValueModel"; export class ReplaceValueTextFormatter extends Behavior implements TextFormatter { - public replaceModels: ReplaceValueModel[] + public replaceModels: ErvuReplaceValueModel[] format(value: string): string { if (this.replaceModels) { diff --git a/frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts b/frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts similarity index 59% rename from frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts rename to frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts index 30423862..e22a1e8d 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts @@ -1,4 +1,4 @@ -export class ReplaceValueModel { +export class ErvuReplaceValueModel { public valueToReplace: string; public value: string; -} \ No newline at end of file +} diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index c5b526d1..c9c5a1fc 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -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 diff --git a/pom.xml b/pom.xml index f175334b..724ca027 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 26eb655c..e52d4bc9 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/resources/src/main/resources/DropdownTreeView.component b/resources/src/main/resources/DropdownTreeView.component new file mode 100644 index 00000000..b21a0563 --- /dev/null +++ b/resources/src/main/resources/DropdownTreeView.component @@ -0,0 +1,45 @@ + + + dd241482-d901-4d0b-9ad2-4d69b6661f82 + DropdownTreeView + fields + false + + 3.177.3 + + + ru.cg.webbpm.packages.base.resources + 3.177.3 + + + + + DropdownTreeView + false + false + + + DropdownTreeViewComponent + component.field + + true + true + + + visible + + true + + + + + + + TreeItemRpcService + component.rpc + + true + true + + + diff --git a/resources/src/main/resources/FilterDropdownTreeView.component b/resources/src/main/resources/FilterDropdownTreeView.component new file mode 100644 index 00000000..21ca0d1a --- /dev/null +++ b/resources/src/main/resources/FilterDropdownTreeView.component @@ -0,0 +1,37 @@ + + + 236ea5f5-8f3b-4266-9395-e7062180423d + FilterDropdownTreeView + filters + false + + 3.177.3 + + + ru.cg.webbpm.packages.base.resources + 3.177.3 + + + + + FilterDropdownTreeView + false + false + + + DropdownTreeViewComponent + component.field + + true + true + + + + FilterComponent + component.filter + + true + true + + + diff --git a/resources/src/main/resources/business-model/appeals.page b/resources/src/main/resources/business-model/appeals.page index 2fb3d667..048215d0 100644 --- a/resources/src/main/resources/business-model/appeals.page +++ b/resources/src/main/resources/business-model/appeals.page @@ -206,9 +206,9 @@ - + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - ef6b1859-1146-4e08-9b35-19c3af856acf + 223ff98e-a925-49c3-9735-7d1fa2f9fcb0 Combo box false false @@ -345,6 +345,20 @@ false + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ef6b1859-1146-4e08-9b35-19c3af856acf + Combo box + false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + ecdabc20-20d2-473f-886a-e3e53a4cb4f1 + DropdownTreeView + false + true + bce312bd-0c82-45e5-89dc-a1af90431c18 b3b5d14e-7ecd-46cd-93b4-60841cabb472 @@ -357,6 +371,7 @@ 019f0534-870c-4e92-b6e9-b65afcdc0238 Горизонтальный контейнер true + false false @@ -630,7 +645,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -663,7 +678,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1818,7 +1833,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1851,7 +1866,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2327,7 +2342,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2360,7 +2375,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3696,7 +3711,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3729,7 +3744,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4255,7 +4270,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4288,7 +4303,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index 914d7859..781a5b06 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -246,9 +246,16 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + a82fddb1-5654-4b24-a337-c164f22af58f + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 47490b00-a300-41e5-9ad6-a9dcfde20e18 + 90036811-af6e-4962-b234-9f90dcb95375 Combo box false false @@ -397,6 +404,7 @@ 4cf989ce-b7fb-4e56-b6b1-38dc1a9149ac Горизонтальный контейнер true + false false @@ -601,7 +609,6 @@ 922d5930-d22f-4b74-9912-17543cbc8493 VB - фильтры true - false false @@ -626,6 +633,7 @@ fa7ae3c8-ea04-4655-8e67-34adece37342 HB - заголовок true + false false @@ -1424,7 +1432,7 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1470,7 +1478,7 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1521,7 +1529,7 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1611,7 +1619,7 @@ behavior -{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3987,12 +3995,6 @@ -rowModelType - - "CLIENT_SIDE" - - - style diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index a8f95274..62ec3bf7 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -41,7 +41,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}}],[null,null,null,null],[null,null,null,null],[null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"7":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"8":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"punishment":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"prosecution","refToColumns":[{"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"punishment","refToColumns":[{"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null]],"mainNodeIndex":0} @@ -93,7 +93,6 @@ bee73e63-b4c0-4cd7-b2f1-2a9d0bc919e8 Горизонтальный контейнер true - false false @@ -375,6 +374,7 @@ c79fdd00-a749-4b79-9a0e-ef89fb276c96 Горизонтальный контейнер true + false false @@ -593,7 +593,6 @@ 67120d9a-602f-44a1-9ede-88a2e797a295 Вертикальный контейнер - сведения о гражданине true - false false @@ -1579,7 +1578,6 @@ 999acadc-8a62-45b9-ae62-9d653411fdb6 Личные сведения true - false false @@ -1675,179 +1673,173 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - d3cc5314-3f68-4f7e-b8f9-083562f65a68 - HB паспорт + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 9761eb8f-3e6c-401f-b6f6-34e9fb3eb8b9 + Filter group true - false false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 4c101735-cabc-4327-b0fd-fcfa21eb06b7 - Вид документа + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"9a8bbda3-a7e1-4ca4-b709-e712039aacfd","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + b218cd5c-b76f-472d-85c8-562613d5a7c6 + citizen_id (filter) false false - - disabled - - true - - - - initialValue - - null - - label - "Вид документа" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + "citizen_id" - - - - + - columnForSave + operation - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"employment"} + "EQUAL" + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"recruit_id"} + + + + + + + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 45fb28c3-9823-49b3-8208-0c6803977edf - Серия и номер - false - false - - - - initialValue - - null - - - - label - - "Серия и номер" - - - - style - - - -width - - null - - - - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - - TextBuilder - component.util - - true - true - - - parts - - + + 16071adb-3bdf-4c33-b29b-886876016415 + 9a8bbda3-a7e1-4ca4-b709-e712039aacfd + Grid_иностранное гражданство + true + true + + + + 16071adb-3bdf-4c33-b29b-886876016415 + 9a8bbda3-a7e1-4ca4-b709-e712039aacfd + Grid_паспорт + true + false + + + + autoStretchColumns + + true + + + + theme + + "BALHAM_DARK" + + + + + + + + gridService + + + + loadDao - inputControl + graph - {"objectId":"e14edd5e-f32b-4523-b307-d7e12b9e06c6","packageName":"component","className":"Text","type":"TS"} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"passport":{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + e374fc3f-1c60-4607-884d-909fcd4c3636 + Серия и номер + false + false + + + + + displayColumns + + + + + + entityColumn + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_series"} + + + + + + + + + + entityColumn + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_number"} - postfix + prefix " " @@ -1855,13 +1847,172 @@ - + + + + displayName + + "Серия и номер" + + + + displayType + + "MULTI_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"country_name"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + af2227a4-cd6e-47bb-9f0a-a1b62ca92b09 + Дата выдачи + false + false + + + + valueFormatter + + + DateFormatter + component.grid.formatters + + + + + + + + + displayName + + "Дата выдачи" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"issue_date"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 9df54d1b-75fc-4984-9afe-8ef42971d9fd + Код подразделения + false + false + + + + + displayName + + "Код подразделения" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"unit_code"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 4b7263cb-fa75-4028-9c05-f573b6827cf8 + Статус документа + false + false + + + + + displayName + + "Статус документа" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"actual"} + + + + + + + ReplaceValueFormatter + component.grid.formatters + + true + true + + + valuesToReplace + + - inputControl + newValue - {"objectId":"45131b35-22ce-4748-84c3-be9bb0fb9345","packageName":"component","className":"Text","type":"TS"} + "Действительный" + + + + regex + + "true" + + + + + + + + + + newValue + + "Недействительный" + + + + regex + + "false" @@ -1872,425 +2023,50 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - e14edd5e-f32b-4523-b307-d7e12b9e06c6 - Паспорт серия + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 97fc89e4-fc5e-4178-93be-34f9d5bacbe0 + Наименование органа, выдавшего документ false false - + + - initialValue + displayName - null + "Наименование органа, выдавшего документ" - label + displayType - "серия" + "ONE_COLUMN" - style + field - - -width - - null - - - - - - - textFormatter - - - - - - visible - - false - - - - - - - - - - - columnForSave - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"passport_series"} - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 45131b35-22ce-4748-84c3-be9bb0fb9345 - Паспорт номер - false - false - false - - - - initialValue - - null - - - - label - - "номер" - - - - style - - - -width - - null - - - - - - - textFormatter - - - - - - visible - - false - - - - - - - - - - - columnForSave - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"passport_number"} - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 719093ce-aa65-4963-9e16-78b3f5820eda - Дата выдачи - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Дата выдачи" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c32c36dc-1a00-401e-8ae3-6eef29cb65f2 - Код подразделения - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Код подразделения" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"organization_name"} + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + d3cc5314-3f68-4f7e-b8f9-083562f65a68 + HB паспорт + true + true + d7d54cfb-26b5-4dba-b56f-b6247183c24d bb841fa3-d799-4507-b17c-745e4ae6419d Hbox кем выдан true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 478fb2e3-82a2-42c8-baa1-89ec8ee8b5b4 - Статус документа - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Статус документа" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 3577239e-2bb7-476f-b496-e9747b5baf87 - Наименование органа, выдавшего документ - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Наименование органа, выдавшего документ" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - + true @@ -2298,6 +2074,7 @@ 02ba0224-fcbe-45cd-be93-aa9ea32145ce Vbox_место жительства true +false false @@ -2386,7 +2163,7 @@ - "font-bold" + "subtitle" @@ -2662,7 +2439,7 @@ - "font-bold" + "subtitle" @@ -6380,7 +6157,6 @@ c3b1ac79-f3da-4d48-b7e5-810010ec64d9 HB - мобил, добровол, контракт true - false false @@ -7283,7 +7059,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"citizen_id"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"recruit_id"} @@ -7395,7 +7171,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"name"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"restriction_name"} @@ -7437,7 +7213,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"date_application"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"decision_date_create"} @@ -7479,7 +7255,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"withdrawal_date"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"cancel_date"} @@ -7509,7 +7285,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"status"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"status_measure"} @@ -9883,7 +9659,7 @@ - "font-bold" + "subtitle" @@ -12437,7 +12213,7 @@ - "font-bold" + "subtitle" @@ -12744,7 +12520,7 @@ - "font-bold" + "subtitle" @@ -13057,7 +12833,7 @@ - "font-bold" + "subtitle" @@ -13300,7 +13076,7 @@ - "font-bold" + "subtitle" @@ -15633,7 +15409,7 @@ - "font-bold" + "subtitle" @@ -15834,7 +15610,6 @@ f5159cc8-9f20-4f88-91bf-139ebe97b5df Grid true - false false @@ -15844,6 +15619,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -16017,7 +15798,7 @@ - "font-bold" + "subtitle" @@ -16154,7 +15935,6 @@ 63aeb701-89aa-43f7-9b6c-b55c03302036 Grid_вич true - false false @@ -16164,9 +15944,16 @@ true + + theme + + "BALHAM_DARK" + + + false gridService @@ -16289,7 +16076,7 @@ - "font-bold" + "subtitle" @@ -16436,6 +16223,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -16603,7 +16396,7 @@ - "font-bold" + "subtitle" @@ -16750,6 +16543,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -16977,7 +16776,7 @@ - "font-bold" + "subtitle" @@ -17124,6 +16923,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -17963,7 +17768,7 @@ - "font-bold" + "subtitle" @@ -18426,7 +18231,7 @@ - "font-bold" + "subtitle" @@ -19080,12 +18885,6 @@ false - - disabled - - true - - heading @@ -19189,7 +18988,7 @@ - "font-bold" + "subtitle" @@ -19243,12 +19042,11 @@ false - + d7d54cfb-26b5-4dba-b56f-b6247183c24d - 6b5d4505-3913-44fd-a936-9492ed0b6195 + 0ed0dda6-faae-4e41-a957-a2e92435b408 Hbox true - false false @@ -19309,12 +19107,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_basis"} @@ -19374,17 +19171,28 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_number"} + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 6b5d4505-3913-44fd-a936-9492ed0b6195 + Hbox + true + false + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 af8a929c-1879-4f0c-890f-435fb93aa552 @@ -19439,12 +19247,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_date"} @@ -19504,12 +19311,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_authority"} @@ -19521,7 +19327,6 @@ 327af2fc-5966-45a3-a6d0-1adaf498649c Hbox true - false false @@ -19582,12 +19387,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_basis"} @@ -19647,17 +19451,28 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_number"} + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 7c88fa47-2d5b-4b02-a5dd-77fe81708fc0 + Hbox + true + false + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 55feffdd-e47e-4c8d-8380-7478c82625c1 @@ -19712,12 +19527,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_date"} @@ -19777,12 +19591,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_authority"} @@ -19869,7 +19682,7 @@ - "font-bold" + "subtitle" @@ -19923,425 +19736,300 @@ false - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 551ba182-2369-4442-a0c8-d45226043bc2 - Hbox + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 11a431f3-038f-4471-9270-7ca0e4c5de5b + Filter group true false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 75a93b25-23ac-45b6-b58a-9f9415c72425 - Наличие права проживания в иностранном государстве + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"b31d5075-d3ea-4335-9afa-e3645008917c","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + e9dfe6ff-25ba-4908-98d0-17083259f7ed + citizen_id (filter) false false - - initialValue - - null - - label - "Наличие права проживания в иностранном государстве" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + "citizen_id" - - - - + - columnForSave + operation - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"acquired_citizenship"} + "EQUAL" + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"recruit_id"} + + + + + + + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 37706944-74a7-4ef2-947b-0777a408af27 + + + 16071adb-3bdf-4c33-b29b-886876016415 + b31d5075-d3ea-4335-9afa-e3645008917c + Grid_иностранное гражданство + true + false + + + + autoStretchColumns + + true + + + + theme + + "BALHAM_DARK" + + + + + + + + gridService + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizenship_foreign":{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + e254e728-b508-491d-9d14-1fdde7dff1db Наименование государства false false - + + - initialValue - - null - - - - label + displayName "Наименование государства" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"country_name"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 958ddfd3-12a6-4be3-9b18-90a907faf20e - Hbox - true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - ea5ae056-c741-45ac-be03-acdbfab7396f + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 7b289d26-aff6-4d84-a454-7886624183fd Основание получения права на постоянное проживание false false - + + - initialValue - - null - - - - label + displayName "Основание получения права на постоянное проживание" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right_basis"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - dc96861f-ff45-460d-a38b-c344995f6a64 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 2dbd3d95-a0c9-4da9-9a5e-4f13dafa66fc Дата возникновения права на постоянное проживание false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Дата возникновения права на постоянное проживание" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right_date"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - e1b3161d-e94e-40ed-a0b5-4aea5c28cfe2 - Hbox - true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8499b2ee-51fc-43fc-83e6-e668e3871c58 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + ae557b88-cf36-4cdf-b99f-8b874f4b6702 Основание получения иностранного гражданства false false - + + - initialValue - - null - - - - label + displayName "Основание получения иностранного гражданства" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"citizenship_basis"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 3c3f02cd-883c-48a2-83cf-7bb52d81f6ea + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 6e2bedb9-88f9-40ed-984f-3fcb42e3e507 Дата получения иностранного гражданства false false - + - initialValue + valueFormatter - null - - - - label - - "Дата получения иностранного гражданства" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter + DateFormatter + component.grid.formatters - - - - - false + - columnForSave + displayName - null + "Дата получения иностранного гражданства" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"citizenship_date"} @@ -20557,6 +20245,13 @@ + + +27912fc5-0be7-4d4c-ae46-a82979253599 +11a431f3-038f-4471-9270-7ca0e4c5de5b +Filter group +true +true ba24d307-0b91-4299-ba82-9d0b52384ff2 @@ -20786,6 +20481,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21151,6 +20852,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21612,6 +21319,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21990,6 +21703,12 @@ + + theme + + "BALHAM_DARK" + + @@ -22234,12 +21953,6 @@ false - - disabled - - true - - heading @@ -22474,12 +22187,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"information"} @@ -22551,12 +22263,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"period_office"} @@ -22616,12 +22327,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"end_date"} @@ -22825,12 +22535,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"information"} @@ -22902,12 +22611,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"end_date"} @@ -22967,12 +22675,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"cancellation_date"} @@ -22993,16 +22700,9 @@ df066734-2e41-4721-b37c-d1d27536377b Сведения о судимости и уголовном преследовании true - false false - - disabled - - true - - heading @@ -23093,754 +22793,497 @@ false - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 9ad54f07-7d54-4af9-8b9c-918882776e81 - Hbox + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 4112b27a-28cf-4538-9562-af4387af9a10 + Filter group true false false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 2533cb48-6eec-4885-a5ee-bbb03c9454e8 - Сведения о факте уголовного преследования либо о прекращении уголовного преследования + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"1b7f7bcb-5b22-4904-a4ac-6822f486d514","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 93d489e2-fb46-420c-aa33-28b898664e4d + citizen_id (filter) false false - - initialValue - - null - - label - "Сведения о факте уголовного преследования либо о прекращении уголовного преследования" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + "citizen_id" - - - - - false + - columnForSave + operation - null + "EQUAL" + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"} + + + + + + + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 64cc66ac-4a0b-4b01-89dc-aa9c8a763c5a + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2d9d08a6-500c-4741-8cb8-d3b19bbd9ebb + Action Controller + false + true + + + + 16071adb-3bdf-4c33-b29b-886876016415 + 1b7f7bcb-5b22-4904-a4ac-6822f486d514 + Grid_уголовное преследование + true + false + false + + + + autoStretchColumns + + true + + + + theme + + "BALHAM_DARK" + + + + + + + + gridService + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + + columnSorts + + + + + + field + + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"create_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + ac68d867-218d-4778-8745-6a04f0c40cf9 Вид уголовного преследования false false - + + - initialValue - - null - - - - label + displayName "Вид уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"kind"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 65faa42d-c894-46d2-b98e-ae7bc74cc3d5 - Hbox - true - false - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - a4ea31a9-4dad-4e32-83bf-327643bc6556 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 3093524e-e809-4678-b90e-f12e5f924e13 Дата возбуждения уголовного дела false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Дата возбуждения уголовного дела" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"create_date"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - f93a3b38-522c-4f63-a158-2b0fb6a943f1 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + a5a1d189-6f5d-482a-ae82-e12b498f40a0 Номер уголовного дела (предварительный) false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Номер уголовного дела (предварительный)" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"case_number"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 30377913-84ec-449d-8365-d665909d53fd + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + a92114cb-88d8-4f61-85d1-a982e6745501 Наименование органа, принявшего решение false false - + + - initialValue - - null - - - - label + displayName "Наименование органа, принявшего решение" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"authority_name"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 24cae97a-6657-4a50-94dc-a6cd39517b0b + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 052e5842-3737-4bf0-baee-0dd7be402beb Пункт, часть, статья УК РФ false false - + + - initialValue - - null - - - - label + displayName "Пункт, часть, статья УК РФ" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"law_point"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - fa2456ea-c1b7-4250-b17a-2ec5f7e0acf6 - Hbox - true - false - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - caccedd6-c142-440c-9d5d-ebbafd858fa8 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + d0e7a70c-1ad2-43dd-afba-212868bf813a Дата прекращения уголовного преследования false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Дата прекращения уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"close_date"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 25e68e82-eb48-4032-b4ba-16cdbb050d7a + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 8a091628-31c2-4be8-9960-b803cdc0c3c3 Основание прекращения уголовного преследования false false - + + - initialValue - - null - - - - label + displayName "Основание прекращения уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"termination_basis"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 130e3b9c-cca0-46a8-90d2-54f1b5b11c72 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 1e6b574f-471c-4c16-9583-793a22ffa14c Признак передачи в суд уголовного дела в отношении гражданина false false - + + - initialValue - - null - - - - label + displayName "Признак передачи в суд уголовного дела в отношении гражданина" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"transfer_to_court"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 16f8f943-1941-4831-8fee-80fccbb23cee + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + aa944443-460b-40db-9a36-aa73175758cb Номер уголовного дела (судебный) false false - + + - initialValue - - null - - - - label + displayName "Номер уголовного дела (судебный)" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"case_number_court"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - e42285ee-2d1c-47f3-860d-f37c493d0700 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 34246611-c254-47c3-b719-00d0b08b0d3e Сведения о переквалификации деяния false false - + + - initialValue - - null - - - - label + displayName "Сведения о переквалификации деяния" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"reclassification"} @@ -23980,12 +23423,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence"} @@ -24045,12 +23487,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence_changed"} @@ -24110,12 +23551,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentense_date"} @@ -24188,12 +23628,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"authority_name"} @@ -24258,16 +23697,16 @@ columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"law_point"} - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - cad884f8-2337-4ee8-8d6b-65c989b4fe02 - Срок наказания + 89281b76-7816-4abe-b45c-bb7f49a6a16b + Вид наказания false false @@ -24281,7 +23720,7 @@ label - "Срок наказания" + "Вид наказания" @@ -24318,20 +23757,19 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"punishment_type"} - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - 89281b76-7816-4abe-b45c-bb7f49a6a16b + 53ce4bea-0d35-4cd2-9606-f8bf7477a4d5 Код вида наказания false false @@ -24383,12 +23821,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"punishment_code"} @@ -24467,21 +23904,43 @@ 368464bb-a786-465a-8fab-d740c0fd8388 Hbox true - false false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - d2e82323-f838-4e58-befb-b94b6b8ec971 - Признак отбывания наказания в местах лишения свободы + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + a0b43271-5940-4092-9b85-fb89fbee550b + Признак отбывания наказания в местах лишения свободы_checkbox false false - + + + allowNull + + true + + + + cssClasses + + + +"check-invert" + + + + + + + disabled + + true + + initialValue @@ -24490,101 +23949,51 @@ label + + " " + + + + + + + + + false + + + columnForSave + + null + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 0c4dd753-e88b-426b-b7eb-5fa65d5d0d8a + Признак отбывания наказания в местах лишения свободы_text + false + false + + + + initialValue "Признак отбывания наказания в местах лишения свободы" - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c014d150-614c-4108-abaf-ed43f094ed82 - Наименование места отбывания наказания - false - false - - - - initialValue - - null - - label - "Наименование места отбывания наказания" + null textFormatter - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + @@ -24604,71 +24013,782 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 04bdfbb8-efee-4f85-aaf4-cc59cb57636e - Адрес места отбывания наказания + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + eb680691-fb58-4757-bfa2-1264c10f59d2 + Vbox + true + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2d47cdc2-2011-4467-a62d-298f162f18a4 + AC_признак отбывания наказания_true false false - + - initialValue + eventRefs - null + + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + - label - - "Адрес места отбывания наказания" - - - - textFormatter + ifCondition -replaceModels +conditions - + - value + _isGroupSelected - "-" + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + + + _isGroupSelected + + true + + + + group + + + +conditions + + + + + + _isGroupSelected + + true + + + + group + + + +conditions + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +conditionSecondPart + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "GREATER_THAN_OR_EQUAL" + + + + + + +logicalOperation + + null - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - false - + + + + + + - columnForSave + _isGroupSelected - null + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_EMPTY" + + + + + + + + + + + +logicalOperation + + "OR" + + + + + + + + + + + +logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"a0b43271-5940-4092-9b85-fb89fbee550b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setValue" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2e74c1c0-cde7-4355-8e9a-4f3067394548 + AC_признак отбывания наказания_false + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + +conditions + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +conditionSecondPart + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "LESS_THAN" + + + + + + + + + + + + + +logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"a0b43271-5940-4092-9b85-fb89fbee550b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setValue" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c014d150-614c-4108-abaf-ed43f094ed82 + Наименование и адрес места отбывания наказания + false + false + + + + initialValue + + null + + + + label + + "Наименование и адрес места отбывания наказания" + + + + textFormatter + + + + replaceModels + + + + + + value + + "-" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence_place"} + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -24736,12 +24856,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"start_date"} @@ -24801,12 +24920,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"planned_date"} @@ -24866,12 +24984,47 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_date"} + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 49e5ec22-8aaa-4f6c-84e0-e84541253686 + Date time picker + false + false + + + + dateValueFormat + + "DATE" + + + + visible + + false + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_date"} @@ -24931,25 +25084,80 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_reason"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 40879edf-fa19-43b8-a247-b87e6fd6dcff + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c72a8505-a983-47f2-bd16-e802770f96e2 + Vbox + true + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9a37d336-cd90-418d-960e-0fdde0da3854 + Hbox + true + true + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 630ce2c5-75fb-42e7-ae54-a2034bd49f1a Признак отбывания наказания в виде обязательных работ false + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9a37d336-cd90-418d-960e-0fdde0da3854 + Hbox + true + false + false + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 630ce2c5-75fb-42e7-ae54-a2034bd49f1a + Признак отбывания наказания в виде обязательных работ_checkbox + false false - + + + allowNull + + true + + + + cssClasses + + + +"check-invert" + + + + + + disabled + + true + + initialValue @@ -24958,36 +25166,50 @@ label + + " " + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"mandatory_work"} + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 40879edf-fa19-43b8-a247-b87e6fd6dcff + Признак отбывания наказания в виде обязательных работ_text + false + false + + + + initialValue "Признак отбывания наказания в виде обязательных работ" + + label + + null + + textFormatter - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + @@ -27950,6 +28172,7 @@ f8182129-2730-4704-8569-52b5e14436ba Hbox true + false false @@ -28289,6 +28512,7 @@ 0e7ff672-c56e-4daa-9747-673de7146fc3 Hbox true + false false @@ -28496,6 +28720,7 @@ abc82822-6d9a-4453-9c50-64e9347cd169 Hbox true + false false @@ -30455,6 +30680,256 @@ + + + + + + behavior + + {"objectId":"e9dfe6ff-25ba-4908-98d0-17083259f7ed","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + + + + + + + behavior + + {"objectId":"93d489e2-fb46-420c-aa33-28b898664e4d","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + + + + + + + behavior + + {"objectId":"b218cd5c-b76f-472d-85c8-562613d5a7c6","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc + CurDate + false + false + false + + + + visible + +false + + + + + + + + + false + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + fad533d1-66d2-4737-9492-3db4bc727ee6 + AC_curdate + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c1ded618-c0e0-4068-b160-29c489aaf8f6","packageName":"component.container","className":"VBox","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "setCurrentDate" + + + + value + + null + + + + diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 92b6a768..90eb8efb 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -188,9 +188,16 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 88a51057-2192-426e-b46b-96abbcb90608 + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 1776e9b1-dafa-47ee-8d99-b6797144cc93 + 7c78831c-9af0-49d2-9f7e-b357abf0a6ef Combo box false false @@ -325,6 +332,28 @@ false + + + ComboboxFilterComponent + ervu-dashboard.component.filter + + true + true + + + isBusinessId + +true + + + + operation + +"EQUAL" + + + + bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -345,6 +374,7 @@ 9021abd0-d34a-43f2-a12d-649e728db7b1 Горизонтальный контейнер true + false false @@ -416,6 +446,13 @@ + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 88a51057-2192-426e-b46b-96abbcb90608 + DropdownTreeView + false + true + fd7e47b9-dce1-4d14-9f3a-580c79f59579 c696d351-c814-4abb-9f9e-fbb50eadfc49 @@ -530,7 +567,6 @@ 6710c493-e4f6-4a38-b56a-3dcf5cf7269b Всего состоят на учете true - false false @@ -600,7 +636,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -633,7 +669,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1683,31 +1719,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1725,39 +1842,55 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + + @@ -1819,7 +1952,7 @@ grace -"10%" +"50%" @@ -1883,6 +2016,12 @@ + + noDataText + + "0" + + style @@ -1935,6 +2074,96 @@ true + + + weight + + null + + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -2885,7 +3114,6 @@ bc72b920-b037-453b-b7d6-2aae8a5ab38d VB - Подлежат постановке на учет true - false false @@ -2954,7 +3182,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2987,7 +3215,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3071,7 +3299,6 @@ 5d23344d-2a90-488c-b936-440edc766dcc Вертикальный контейнер true - false false @@ -4071,31 +4298,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -4113,41 +4421,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -4209,7 +4530,7 @@ grace -"10%" +"50%" @@ -4273,6 +4594,12 @@ + + noDataText + + "0" + + style @@ -4319,6 +4646,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -5299,6 +5710,7 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true + false false @@ -5551,7 +5963,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5584,7 +5996,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5647,6 +6059,7 @@ 99c90421-8054-4f0e-9d5e-aa1c29e23ecc Горизонтальный контейнер - Попадающие под призыв true +false false @@ -7511,7 +7924,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7544,7 +7957,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9445,6 +9858,7 @@ bf17f367-0137-4d8b-8168-6b7c38d287a2 VB - Обжалование true + false false @@ -9513,7 +9927,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9546,7 +9960,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 3372123d..584b4ed3 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -331,11 +331,19 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + cf76edb6-2f7a-4017-877e-0f49bdec7e93 + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - a7c50c86-84f8-4092-8fbc-d04c6d2adbb1 + a16e0d37-04dc-47b5-b7a6-b162bdbe1f40 Combo box false + false false @@ -510,6 +518,7 @@ 06e1198c-f255-420a-b577-6de772702bb1 Горизонтальный контейнер true + false false @@ -708,7 +717,6 @@ 3cd1c88a-a967-4ede-8090-685369098604 Всего состоят на учете true - false false @@ -772,7 +780,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -805,7 +813,7 @@ behavior -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1763,31 +1771,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1805,39 +1894,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1899,7 +2003,7 @@ grace -"10%" +"50%" @@ -2009,6 +2113,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -2965,6 +3153,7 @@ ec7e0341-cba8-4c6a-a472-6ff1dd337054 Возраст и Дети до 18лет true + false false @@ -2976,6 +3165,7 @@ af7000dd-283a-45b6-acbf-6e1de7f22f88 Возраст true + false false @@ -3168,7 +3358,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3201,7 +3391,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3912,7 +4102,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3945,7 +4135,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4689,7 +4879,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4722,7 +4912,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5437,7 +5627,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5470,7 +5660,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6214,7 +6404,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6247,7 +6437,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6958,7 +7148,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6991,7 +7181,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7831,7 +8021,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7864,7 +8054,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9448,7 +9638,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9481,7 +9671,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -11065,7 +11255,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -11098,7 +11288,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -12598,6 +12788,7 @@ 2359c3ed-8136-4822-9e4c-e741b5686010 VB - семейное положение true + false false @@ -13002,6 +13193,7 @@ + false @@ -13096,7 +13288,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -13129,7 +13321,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -13269,6 +13461,7 @@ 221f086a-83ce-4516-af03-aa6bb50eb427 VB - в браке/холост true + false false @@ -13345,7 +13538,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -13378,7 +13571,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -14358,6 +14551,7 @@ + false @@ -14466,7 +14660,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -14499,7 +14693,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -14703,7 +14897,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -14736,7 +14930,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -15716,6 +15910,7 @@ + false @@ -15810,7 +16005,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -15843,7 +16038,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -16047,7 +16242,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -16080,7 +16275,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -16753,6 +16948,7 @@ 0caafab8-de1c-42b0-b845-fca7e0e97ec3 VB - Занятость true + false false @@ -17186,6 +17382,7 @@ + false @@ -17262,7 +17459,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -17313,7 +17510,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -17442,6 +17639,7 @@ 040d034c-91b6-484e-89be-61240013bfeb VB - в учатся/работают/безработ true + false false @@ -17518,7 +17716,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -17551,7 +17749,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -18418,6 +18616,7 @@ + false @@ -18428,7 +18627,6 @@ ervu-dashboard.component.chart true - true cssClasses @@ -18527,7 +18725,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -18560,7 +18758,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -18688,6 +18886,7 @@ 84a87967-c60c-4b7a-83d1-9f1ec58fba16 VB - в учатся/работают/безработ true + false false @@ -18764,7 +18963,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -18797,7 +18996,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -19657,6 +19856,7 @@ + false @@ -19765,7 +19965,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -19798,7 +19998,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -19926,6 +20126,7 @@ 5fbce3e8-88d1-48da-b868-aa00549af586 VB - в учатся/работают/безработ true + false false @@ -20002,7 +20203,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -20035,7 +20236,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -20570,6 +20771,7 @@ 28f4be3e-5a7f-4c9c-b414-5ed0d0107739 Наличие водительского удостоверения true + false false @@ -20762,7 +20964,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -20795,7 +20997,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -21748,7 +21950,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -21781,7 +21983,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -22761,7 +22963,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -22794,7 +22996,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -23747,7 +23949,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -23780,7 +23982,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -24760,7 +24962,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -24793,7 +24995,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -25746,7 +25948,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -25779,7 +25981,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -26839,7 +27041,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -26872,7 +27074,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -27273,6 +27475,7 @@ + false @@ -27374,7 +27577,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -27407,7 +27610,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -28713,7 +28916,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -28746,7 +28949,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -28809,7 +29012,6 @@ 04c978b3-c4d4-4fd3-a7f3-1279b7f7f9b9 VB - график true - false false @@ -29148,6 +29350,7 @@ + false @@ -29249,7 +29452,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -29282,7 +29485,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -30616,7 +30819,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -30649,7 +30852,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -30712,7 +30915,6 @@ 6fcfa6af-0c5d-4c83-b34d-2bfe7363d121 VB - график true - false false @@ -31046,6 +31248,7 @@ + false @@ -31147,7 +31350,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -31180,7 +31383,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index f19f0a01..cd7eb4a0 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -26,6 +26,7 @@ 2a5b0bb1-72ef-4473-9006-0cde6cb5dc62 Горизонтальный контейнер true + false false @@ -295,9 +296,16 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + f3ba1055-e764-420f-9c42-3232bbcbb321 + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 49393e6f-f349-4f15-99ca-f0f3e794f67d + 41e6e628-5e34-4e8b-894b-1f60d3461bd0 Combo box false false @@ -490,6 +498,7 @@ be84d33b-5d20-416f-8393-1328fd5ed190 Горизонтальный контейнер true + false false @@ -688,7 +697,6 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true - false false @@ -752,7 +760,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -787,7 +795,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1790,32 +1798,112 @@ - datasetsConfiguration + chartType - - - datasets - - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной слуюжбы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1833,39 +1921,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1933,7 +2036,7 @@ grace -"10%" +"50%" @@ -1999,6 +2102,12 @@ + + noDataText + + "0" + + style @@ -2045,6 +2154,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -3025,6 +3218,7 @@ 76298b31-e12e-4ce4-b510-3e2378cb672c VB - Возраст и занятость true + false false @@ -3036,6 +3230,7 @@ 90815563-92e7-462e-9799-94bc6347c6b1 Возраст true + false false @@ -3228,7 +3423,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3261,7 +3456,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3972,7 +4167,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4005,7 +4200,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4749,7 +4944,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4782,7 +4977,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5493,7 +5688,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5526,7 +5721,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6270,7 +6465,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6303,7 +6498,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7014,7 +7209,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7047,7 +7242,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7695,6 +7890,7 @@ e304e85c-a38b-48f9-82b6-2b3fc14a912c VB - Занятость true + false false @@ -8097,7 +8293,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8130,7 +8326,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8995,7 +9191,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9028,7 +9224,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9897,7 +10093,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9930,7 +10126,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10544,7 +10740,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10577,7 +10773,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10640,6 +10836,7 @@ 1e4b856b-4819-4132-90e2-6b29bdf48081 Горизонтальный контейнер true + false false @@ -10723,6 +10920,7 @@ 3fec20ea-9d76-4166-af15-048e370dd6da Вертикальный контейнер true + false false @@ -12767,7 +12965,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -12800,7 +12998,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -12919,6 +13117,20 @@ + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 30f1bbf2-b94b-4c47-97d0-d9240ba51b28 + Filter group + true + true + + + 97aef2b8-52a1-47f4-a930-9b0bce6994f9 + bc422eca-7177-433c-a0a5-d77f022ac443 + FilterDropdownTreeView + false + true + 85eb12aa-f878-4e29-b109-9d31af0fefb4 621e0b1c-cdec-4ed6-a82e-bc259a6fd4fa @@ -13375,6 +13587,7 @@ + false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -13497,7 +13710,7 @@ filterComponent -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -13530,7 +13743,7 @@ - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/ratings.page b/resources/src/main/resources/business-model/ratings.page index 958bbd1b..d6f22b7e 100644 --- a/resources/src/main/resources/business-model/ratings.page +++ b/resources/src/main/resources/business-model/ratings.page @@ -252,6 +252,20 @@ fdad3248-54b5-4d3d-914e-ad8d4d5ec0ff Combo box false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 25b29b33-5c56-485c-b734-6c48669448ef + DropdownTreeView + false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 487a7008-1a93-4ea4-8524-067728b8597d + Combo box + false false false @@ -397,6 +411,7 @@ 2215cb71-27f6-4db2-a7c4-438498404c86 Горизонтальный контейнер true + false false @@ -1254,6 +1269,7 @@ a24d8714-b47f-4f2e-8ff4-3c120ab1f7ad HB - title true + false false diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index 9c0a8427..b4d3c8e8 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -288,9 +288,16 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 051c3e53-8e91-4ba4-8b5d-a2c20865adc9 + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - c02754db-ba91-4be8-b11a-06e2c5dada24 + ba22549b-4759-40d8-8d78-aa13b3a332c0 Combo box false false @@ -482,6 +489,7 @@ c129b37c-c980-4ce5-b152-ca154807a6a2 Горизонтальный контейнер true + false false @@ -680,6 +688,7 @@ 7206a4d4-1dd2-4a36-bad7-a692bf291d79 VB - Призыв true + false false @@ -890,7 +899,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -923,7 +932,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1124,6 +1133,7 @@ + false DoughnutMockChartV2Service ervu_dashboard.component.chart @@ -1889,6 +1899,7 @@ 7589d279-f6bc-430a-8a9d-908a84af789d VB - весна true + false false @@ -1939,7 +1950,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1972,7 +1983,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3071,7 +3082,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3104,7 +3115,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3648,10 +3659,10 @@ - false + false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -3799,7 +3810,7 @@ filterComponent - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -3832,7 +3843,7 @@ - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -5914,7 +5925,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5947,7 +5958,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6741,7 +6752,7 @@ filterComponent - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -6774,7 +6785,7 @@ - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -8844,6 +8855,7 @@ 6da4fd55-7c44-452f-bb1b-c7bc75ab21fd VB - Обжалование true + false false @@ -8946,6 +8958,7 @@ 3123f8a4-427f-4986-8238-d1918dab7198 VB - осень true + false false @@ -8962,7 +8975,7 @@ graph - {"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} + {"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} @@ -8996,7 +9009,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9029,7 +9042,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9062,7 +9075,7 @@ graph - {"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} + {"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} @@ -9165,6 +9178,7 @@ + false DoughnutMockChartV2Service ervu_dashboard.component.chart @@ -9219,7 +9233,6 @@ 4650f6c6-bb8e-4c1d-9201-df57ada9e0fe HB - решено true -false false @@ -9533,7 +9546,6 @@ a7fda8f9-000f-4400-b040-24c842938ac1 HB - не решено true -false false @@ -9847,7 +9859,6 @@ e16ef66d-a068-4623-86cb-97ba74bc9442 HB - время решения true -false false @@ -10027,7 +10038,6 @@ 9661fbc4-ea41-4206-95f0-e15b0fc8c3e3 HB - оценка удовлетворенности true -false false @@ -10266,7 +10276,7 @@ graph - {"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} + {"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} @@ -10300,7 +10310,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10333,7 +10343,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10366,7 +10376,7 @@ graph - {"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} + {"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} diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index 4fc4a838..d60ab38d 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -287,9 +287,16 @@ - + + 630accd8-3776-4fc1-a87c-3a0f05274678 + bcda3e31-265c-4f80-8984-fd0359b0fc36 + DropdownTreeView + false + true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 01426200-9f22-492e-a812-b9d08afd02ce + e80a965c-389c-4a42-ade9-cc551317f3a6 Combo box false false @@ -475,6 +482,7 @@ 85a7fcd5-52c1-4e3f-98b6-fddbf951c1c4 Горизонтальный контейнер true + false false @@ -736,7 +744,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -769,7 +777,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1860,31 +1868,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1902,40 +1991,60 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + datasourceJndiName + + null + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1997,7 +2106,7 @@ grace -"10%" +"50%" @@ -2059,6 +2168,13 @@ + false + + + + noDataText + + "0" @@ -2107,6 +2223,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -3057,6 +3257,7 @@ 01003c5b-75c8-496d-98da-c3c2620dc0aa Категории постановки на ВУ true + false false @@ -3120,7 +3321,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3153,7 +3354,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5333,7 +5534,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5366,7 +5567,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7696,7 +7897,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7729,7 +7930,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8324,6 +8525,7 @@ + false @@ -8334,6 +8536,7 @@ ervu-dashboard.component.chart true +true cssClasses @@ -8439,7 +8642,7 @@ filterComponent -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -8472,7 +8675,7 @@ - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"} diff --git a/test/pom.xml b/test/pom.xml index cebfcdd6..610820dd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard