diff --git a/backend/src/main/java/AppConfig.java b/backend/src/main/java/AppConfig.java index 1b57996..40a6b03 100644 --- a/backend/src/main/java/AppConfig.java +++ b/backend/src/main/java/AppConfig.java @@ -80,7 +80,7 @@ public class AppConfig { @Bean public SpringLiquibase liquibase(@Qualifier("datasource") DataSource dataSource) { SpringLiquibase liquibase = new SpringLiquibase(); - createErvuDashboardSchema(dataSource); + createErvuMetricsSchema(dataSource); liquibase.setDataSource(dataSource); liquibase.setChangeLog("classpath:config/changelog-master.xml"); liquibase.setChangeLogParameters(Collections.singletonMap("projectUser", getProjectDbUserName(dataSource))); @@ -97,7 +97,7 @@ public class AppConfig { } } - private void createErvuDashboardSchema(DataSource dataSource) { + private void createErvuMetricsSchema(DataSource dataSource) { try (Connection connection = dataSource.getConnection()) { LOGGER.info("Start creating ervu_business_metrics schema"); String sql = "CREATE SCHEMA IF NOT EXISTS ervu_business_metrics;"; diff --git a/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java b/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java deleted file mode 100644 index c53717e..0000000 --- a/backend/src/main/java/dto/jivoprofile/JivoProfileDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package dto.jivoprofile; - -import ru.cg.webbpm.modules.webkit.annotations.Model; - -@Model -public class JivoProfileDto { - - public String username; - public String email; - public String phone; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } -} \ No newline at end of file diff --git a/backend/src/main/java/ervu_dashboard/SecurityWebAppInitializer.java b/backend/src/main/java/ervu_business_metrics/SecurityWebAppInitializer.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/SecurityWebAppInitializer.java rename to backend/src/main/java/ervu_business_metrics/SecurityWebAppInitializer.java index ae4c0d1..fce52a0 100644 --- a/backend/src/main/java/ervu_dashboard/SecurityWebAppInitializer.java +++ b/backend/src/main/java/ervu_business_metrics/SecurityWebAppInitializer.java @@ -1,4 +1,4 @@ -package ervu_dashboard; +package ervu_business_metrics; import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/BarMockChartV2Service.java b/backend/src/main/java/ervu_business_metrics/component/chart/BarMockChartV2Service.java similarity index 87% rename from backend/src/main/java/ervu_dashboard/component/chart/BarMockChartV2Service.java rename to backend/src/main/java/ervu_business_metrics/component/chart/BarMockChartV2Service.java index bc5c643..823c769 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/BarMockChartV2Service.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/BarMockChartV2Service.java @@ -1,10 +1,10 @@ -package ervu_dashboard.component.chart; +package ervu_business_metrics.component.chart; import java.util.Arrays; import component.chart.dto.ChartConfigDto; import component.chart.service.ChartV2Service; -import ervu_dashboard.model.chart.BarMockDatasets; +import ervu_business_metrics.model.chart.BarMockDatasets; import model.Filter; /** diff --git a/backend/src/main/java/ervu_dashboard/component/chart/DoughnutMockChartV2Service.java b/backend/src/main/java/ervu_business_metrics/component/chart/DoughnutMockChartV2Service.java similarity index 83% rename from backend/src/main/java/ervu_dashboard/component/chart/DoughnutMockChartV2Service.java rename to backend/src/main/java/ervu_business_metrics/component/chart/DoughnutMockChartV2Service.java index d6549b6..e561ed8 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/DoughnutMockChartV2Service.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/DoughnutMockChartV2Service.java @@ -1,8 +1,8 @@ -package ervu_dashboard.component.chart; +package ervu_business_metrics.component.chart; import component.chart.dto.ChartConfigDto; import component.chart.service.ChartV2Service; -import ervu_dashboard.model.chart.DoughnutMockDatasets; +import ervu_business_metrics.model.chart.DoughnutMockDatasets; import model.Filter; /** diff --git a/backend/src/main/java/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java b/backend/src/main/java/ervu_business_metrics/component/chart/ErvuMultiChartDataSetService.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java rename to backend/src/main/java/ervu_business_metrics/component/chart/ErvuMultiChartDataSetService.java index 0efb8c9..0736edf 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/ErvuMultiChartDataSetService.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.chart; +package ervu_business_metrics.component.chart; import java.util.ArrayList; import java.util.Arrays; @@ -18,10 +18,10 @@ import component.chart.model.ChartColumnSort; import component.chart.model.StaticDataSet; import component.chart.service.MultiChartDataSetService; import component.chart.service.impl.AbstractChartDatasetService; -import ervu_dashboard.component.filter.FilterReferences; -import ervu_dashboard.model.chart.ErvuChartDatasetType; -import ervu_dashboard.model.chart.ColumnAggregationDataSet; -import ervu_dashboard.model.chart.ErvuChartDataSetDto; +import ervu_business_metrics.component.filter.FilterReferences; +import ervu_business_metrics.model.chart.ErvuChartDatasetType; +import ervu_business_metrics.model.chart.ColumnAggregationDataSet; +import ervu_business_metrics.model.chart.ErvuChartDataSetDto; import model.Filter; import model.FilterModel; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java b/backend/src/main/java/ervu_business_metrics/component/chart/RoundSingleChartDataSetService.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java rename to backend/src/main/java/ervu_business_metrics/component/chart/RoundSingleChartDataSetService.java index b338ad1..aeaef8e 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/RoundSingleChartDataSetService.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.chart; +package ervu_business_metrics.component.chart; import java.util.ArrayList; import java.util.Arrays; @@ -20,17 +20,17 @@ import component.chart.dto.SingleChartDataDto; import component.chart.dto.SingleChartDataSetDto; import component.chart.service.SingleChartDataSetService; import component.chart.service.impl.AbstractChartDatasetService; -import ervu_dashboard.component.chart.label.RoundLabelConfiguration; -import ervu_dashboard.component.filter.FilterReferences; -import ervu_dashboard.model.chart.round.RoundAggregationData; -import ervu_dashboard.model.chart.round.RoundChartColumnSort; -import ervu_dashboard.model.chart.round.RoundChartDataDto; -import ervu_dashboard.model.chart.round.RoundChartDataSetConfiguration; -import ervu_dashboard.model.chart.round.RoundChartDataSetDto; -import ervu_dashboard.model.chart.round.RoundChartDataSetDtoWrapper; -import ervu_dashboard.model.chart.round.RoundColumnAggregationDataSet; -import ervu_dashboard.model.chart.round.RoundStaticData; -import ervu_dashboard.model.chart.round.label.ChartLabelModel; +import ervu_business_metrics.component.chart.label.RoundLabelConfiguration; +import ervu_business_metrics.component.filter.FilterReferences; +import ervu_business_metrics.model.chart.round.RoundAggregationData; +import ervu_business_metrics.model.chart.round.RoundChartColumnSort; +import ervu_business_metrics.model.chart.round.RoundChartDataDto; +import ervu_business_metrics.model.chart.round.RoundChartDataSetConfiguration; +import ervu_business_metrics.model.chart.round.RoundChartDataSetDto; +import ervu_business_metrics.model.chart.round.RoundChartDataSetDtoWrapper; +import ervu_business_metrics.model.chart.round.RoundColumnAggregationDataSet; +import ervu_business_metrics.model.chart.round.RoundStaticData; +import ervu_business_metrics.model.chart.round.label.ChartLabelModel; import model.Filter; import model.FilterModel; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/label/AbstractRoundLabelConfiguration.java b/backend/src/main/java/ervu_business_metrics/component/chart/label/AbstractRoundLabelConfiguration.java similarity index 79% rename from backend/src/main/java/ervu_dashboard/component/chart/label/AbstractRoundLabelConfiguration.java rename to backend/src/main/java/ervu_business_metrics/component/chart/label/AbstractRoundLabelConfiguration.java index 135a96c..bcbd41f 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/label/AbstractRoundLabelConfiguration.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/label/AbstractRoundLabelConfiguration.java @@ -1,7 +1,7 @@ -package ervu_dashboard.component.chart.label; +package ervu_business_metrics.component.chart.label; -import ervu_dashboard.model.Font; -import ervu_dashboard.model.chart.round.label.ChartLabelModel; +import ervu_business_metrics.model.Font; +import ervu_business_metrics.model.chart.round.label.ChartLabelModel; import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions; import ru.cg.webbpm.modules.standard_annotations.editor.ColorEditor; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/label/DefaultRoundLabelConfiguration.java b/backend/src/main/java/ervu_business_metrics/component/chart/label/DefaultRoundLabelConfiguration.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/component/chart/label/DefaultRoundLabelConfiguration.java rename to backend/src/main/java/ervu_business_metrics/component/chart/label/DefaultRoundLabelConfiguration.java index d9b98b1..3e71cf5 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/label/DefaultRoundLabelConfiguration.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/label/DefaultRoundLabelConfiguration.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.chart.label; +package ervu_business_metrics.component.chart.label; import java.util.Collections; import property.grid.Formatter; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/label/RoundLabelConfiguration.java b/backend/src/main/java/ervu_business_metrics/component/chart/label/RoundLabelConfiguration.java similarity index 62% rename from backend/src/main/java/ervu_dashboard/component/chart/label/RoundLabelConfiguration.java rename to backend/src/main/java/ervu_business_metrics/component/chart/label/RoundLabelConfiguration.java index 6c40ffd..cf78154 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/label/RoundLabelConfiguration.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/label/RoundLabelConfiguration.java @@ -1,6 +1,6 @@ -package ervu_dashboard.component.chart.label; +package ervu_business_metrics.component.chart.label; -import ervu_dashboard.model.chart.round.label.ChartLabelModel; +import ervu_business_metrics.model.chart.round.label.ChartLabelModel; import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions; diff --git a/backend/src/main/java/ervu_dashboard/component/chart/label/StaticRoundLabelDataSet.java b/backend/src/main/java/ervu_business_metrics/component/chart/label/StaticRoundLabelDataSet.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/component/chart/label/StaticRoundLabelDataSet.java rename to backend/src/main/java/ervu_business_metrics/component/chart/label/StaticRoundLabelDataSet.java index 12ae239..6f52934 100644 --- a/backend/src/main/java/ervu_dashboard/component/chart/label/StaticRoundLabelDataSet.java +++ b/backend/src/main/java/ervu_business_metrics/component/chart/label/StaticRoundLabelDataSet.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.chart.label; +package ervu_business_metrics.component.chart.label; import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions; diff --git a/backend/src/main/java/ervu_dashboard/component/converter/UUIDValueConverter.java b/backend/src/main/java/ervu_business_metrics/component/converter/UUIDValueConverter.java similarity index 89% rename from backend/src/main/java/ervu_dashboard/component/converter/UUIDValueConverter.java rename to backend/src/main/java/ervu_business_metrics/component/converter/UUIDValueConverter.java index 047c3b1..38265db 100644 --- a/backend/src/main/java/ervu_dashboard/component/converter/UUIDValueConverter.java +++ b/backend/src/main/java/ervu_business_metrics/component/converter/UUIDValueConverter.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.converter; +package ervu_business_metrics.component.converter; import java.util.UUID; diff --git a/backend/src/main/java/ervu_dashboard/component/filter/AbstractFilterReference.java b/backend/src/main/java/ervu_business_metrics/component/filter/AbstractFilterReference.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/component/filter/AbstractFilterReference.java rename to backend/src/main/java/ervu_business_metrics/component/filter/AbstractFilterReference.java index 60b4933..0944efb 100644 --- a/backend/src/main/java/ervu_dashboard/component/filter/AbstractFilterReference.java +++ b/backend/src/main/java/ervu_business_metrics/component/filter/AbstractFilterReference.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.filter; +package ervu_business_metrics.component.filter; import component.field.dataconvert.DataConverter; import component.field.dataconvert.DataConverterProvider; @@ -10,7 +10,6 @@ import ru.cg.webbpm.modules.database.bean.filter.EntityFilter; import ru.cg.webbpm.modules.database.bean.filter.FilterOperation; import ru.cg.webbpm.modules.standard_annotations.editor.ObjectRef; import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; -import ru.cg.webbpm.modules.webkit.annotations.Model; import ru.cg.webbpm.modules.webkit.beans.Behavior; /** diff --git a/backend/src/main/java/ervu_dashboard/component/filter/FilterReference.java b/backend/src/main/java/ervu_business_metrics/component/filter/FilterReference.java similarity index 73% rename from backend/src/main/java/ervu_dashboard/component/filter/FilterReference.java rename to backend/src/main/java/ervu_business_metrics/component/filter/FilterReference.java index e8103ad..c08b703 100644 --- a/backend/src/main/java/ervu_dashboard/component/filter/FilterReference.java +++ b/backend/src/main/java/ervu_business_metrics/component/filter/FilterReference.java @@ -1,9 +1,8 @@ -package ervu_dashboard.component.filter; +package ervu_business_metrics.component.filter; import model.FilterModel; import ru.cg.webbpm.modules.database.bean.filter.EntityFilter; -import ru.cg.webbpm.modules.webkit.annotations.Model; /** * @author Vitaly Chekushkin diff --git a/backend/src/main/java/ervu_dashboard/component/filter/FilterReferences.java b/backend/src/main/java/ervu_business_metrics/component/filter/FilterReferences.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/component/filter/FilterReferences.java rename to backend/src/main/java/ervu_business_metrics/component/filter/FilterReferences.java index b17af64..b36ceca 100644 --- a/backend/src/main/java/ervu_dashboard/component/filter/FilterReferences.java +++ b/backend/src/main/java/ervu_business_metrics/component/filter/FilterReferences.java @@ -1,8 +1,7 @@ -package ervu_dashboard.component.filter; +package ervu_business_metrics.component.filter; import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/backend/src/main/java/ervu_dashboard/component/filter/GraphFilterReference.java b/backend/src/main/java/ervu_business_metrics/component/filter/GraphFilterReference.java similarity index 92% rename from backend/src/main/java/ervu_dashboard/component/filter/GraphFilterReference.java rename to backend/src/main/java/ervu_business_metrics/component/filter/GraphFilterReference.java index 74d85de..f89ff60 100644 --- a/backend/src/main/java/ervu_dashboard/component/filter/GraphFilterReference.java +++ b/backend/src/main/java/ervu_business_metrics/component/filter/GraphFilterReference.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.filter; +package ervu_business_metrics.component.filter; import model.filter.FilterableReference; diff --git a/backend/src/main/java/ervu_dashboard/component/filter/StaticFilterReference.java b/backend/src/main/java/ervu_business_metrics/component/filter/StaticFilterReference.java similarity index 90% rename from backend/src/main/java/ervu_dashboard/component/filter/StaticFilterReference.java rename to backend/src/main/java/ervu_business_metrics/component/filter/StaticFilterReference.java index d97b435..cefbdf2 100644 --- a/backend/src/main/java/ervu_dashboard/component/filter/StaticFilterReference.java +++ b/backend/src/main/java/ervu_business_metrics/component/filter/StaticFilterReference.java @@ -1,4 +1,4 @@ -package ervu_dashboard.component.filter; +package ervu_business_metrics.component.filter; import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; diff --git a/backend/src/main/java/ervu_dashboard/model/Font.java b/backend/src/main/java/ervu_business_metrics/model/Font.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/model/Font.java rename to backend/src/main/java/ervu_business_metrics/model/Font.java index 30f0904..2e3eb66 100644 --- a/backend/src/main/java/ervu_dashboard/model/Font.java +++ b/backend/src/main/java/ervu_business_metrics/model/Font.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model; +package ervu_business_metrics.model; import ru.cg.webbpm.modules.webkit.annotations.Model; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/BarMockDataset.java b/backend/src/main/java/ervu_business_metrics/model/chart/BarMockDataset.java similarity index 90% rename from backend/src/main/java/ervu_dashboard/model/chart/BarMockDataset.java rename to backend/src/main/java/ervu_business_metrics/model/chart/BarMockDataset.java index bad7f55..61c8d0a 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/BarMockDataset.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/BarMockDataset.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/BarMockDatasets.java b/backend/src/main/java/ervu_business_metrics/model/chart/BarMockDatasets.java similarity index 87% rename from backend/src/main/java/ervu_dashboard/model/chart/BarMockDatasets.java rename to backend/src/main/java/ervu_business_metrics/model/chart/BarMockDatasets.java index 2ef46b1..efc2ef0 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/BarMockDatasets.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/BarMockDatasets.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import component.chart.dto.IChartDataDto; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationData.java b/backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationData.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationData.java rename to backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationData.java index 1815245..c34d3e0 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationData.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationData.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import property.grid.Formatter; import rpc.LoadGraphSource; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationDataSet.java b/backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationDataSet.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationDataSet.java rename to backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationDataSet.java index 121de61..18ef292 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/ColumnAggregationDataSet.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationDataSet.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import component.chart.enums.MultiChartType; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDataset.java b/backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDataset.java similarity index 88% rename from backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDataset.java rename to backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDataset.java index 1f8613f..d7504f2 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDataset.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDataset.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import ru.cg.webbpm.modules.standard_annotations.editor.ColorEditor; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDatasets.java b/backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDatasets.java similarity index 66% rename from backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDatasets.java rename to backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDatasets.java index 1da4190..d75a259 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/DoughnutMockDatasets.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/DoughnutMockDatasets.java @@ -1,7 +1,7 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import component.chart.dto.IChartDataDto; -import ervu_dashboard.model.chart.round.label.ChartLabelModel; +import ervu_business_metrics.model.chart.round.label.ChartLabelModel; /** * @author Vitaly Chekushkin diff --git a/backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDataSetDto.java b/backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDataSetDto.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDataSetDto.java rename to backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDataSetDto.java index 7bc936b..aceaba5 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDataSetDto.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDataSetDto.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; import java.util.List; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDatasetType.java b/backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDatasetType.java similarity index 73% rename from backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDatasetType.java rename to backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDatasetType.java index 3f53ffa..9be7641 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/ErvuChartDatasetType.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/ErvuChartDatasetType.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart; +package ervu_business_metrics.model.chart; /** * @author Vitaly Chekushkin diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationData.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationData.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationData.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationData.java index 15d9690..b5a5251 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationData.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationData.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import property.grid.Formatter; import rpc.LoadGraphSource; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationDataSet.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationDataSet.java similarity index 94% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationDataSet.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationDataSet.java index 44b1f4b..dc9edea 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundAggregationDataSet.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundAggregationDataSet.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import property.grid.Formatter; import rpc.LoadGraphSource; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartColumnSort.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartColumnSort.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartColumnSort.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartColumnSort.java index 99de7e0..01964f4 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartColumnSort.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartColumnSort.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import rpc.LoadGraphSource; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataDto.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataDto.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataDto.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataDto.java index fe94194..194242d 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataDto.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataDto.java @@ -1,10 +1,10 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import java.util.List; import component.chart.dto.SingleChartDataDto; import component.chart.dto.SingleChartDataSetDto; -import ervu_dashboard.model.chart.round.label.ChartLabelModel; +import ervu_business_metrics.model.chart.round.label.ChartLabelModel; /** * @author Vitaly Chekushkin diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetConfiguration.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetConfiguration.java similarity index 92% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetConfiguration.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetConfiguration.java index 31f1605..f6fba8d 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetConfiguration.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetConfiguration.java @@ -1,6 +1,6 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; -import ervu_dashboard.model.chart.ErvuChartDatasetType; +import ervu_business_metrics.model.chart.ErvuChartDatasetType; import rpc.LoadGraphSource; import ru.cg.webbpm.modules.database.api.dao.LoadDao; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDto.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDto.java index a79227a..430d474 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDto.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import java.util.List; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDtoWrapper.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDtoWrapper.java index 5562f86..264940d 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundChartDataSetDtoWrapper.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import java.util.List; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationData.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationData.java similarity index 94% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationData.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationData.java index 3ae24d4..e24f952 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationData.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationData.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import property.grid.Formatter; import rpc.LoadGraphSource; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationDataSet.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationDataSet.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationDataSet.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationDataSet.java index 88c118c..b6584b5 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundColumnAggregationDataSet.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundColumnAggregationDataSet.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticData.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticData.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticData.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticData.java index 46dfb5f..3d252fc 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticData.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticData.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import java.util.Arrays; import java.util.List; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticDataSet.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticDataSet.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticDataSet.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticDataSet.java index 406305d..3854e8f 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/RoundStaticDataSet.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/RoundStaticDataSet.java @@ -1,4 +1,4 @@ -package ervu_dashboard.model.chart.round; +package ervu_business_metrics.model.chart.round; import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; diff --git a/backend/src/main/java/ervu_dashboard/model/chart/round/label/ChartLabelModel.java b/backend/src/main/java/ervu_business_metrics/model/chart/round/label/ChartLabelModel.java similarity index 89% rename from backend/src/main/java/ervu_dashboard/model/chart/round/label/ChartLabelModel.java rename to backend/src/main/java/ervu_business_metrics/model/chart/round/label/ChartLabelModel.java index fd743c0..b270f85 100644 --- a/backend/src/main/java/ervu_dashboard/model/chart/round/label/ChartLabelModel.java +++ b/backend/src/main/java/ervu_business_metrics/model/chart/round/label/ChartLabelModel.java @@ -1,6 +1,6 @@ -package ervu_dashboard.model.chart.round.label; +package ervu_business_metrics.model.chart.round.label; -import ervu_dashboard.model.Font; +import ervu_business_metrics.model.Font; import ru.cg.webbpm.modules.standard_annotations.editor.ColorEditor; import ru.cg.webbpm.modules.webkit.annotations.Model; diff --git a/backend/src/main/java/ervu_dashboard/security/config/SecurityConfig.java b/backend/src/main/java/ervu_business_metrics/security/config/SecurityConfig.java similarity index 91% rename from backend/src/main/java/ervu_dashboard/security/config/SecurityConfig.java rename to backend/src/main/java/ervu_business_metrics/security/config/SecurityConfig.java index fd9abd5..4d318eb 100644 --- a/backend/src/main/java/ervu_dashboard/security/config/SecurityConfig.java +++ b/backend/src/main/java/ervu_business_metrics/security/config/SecurityConfig.java @@ -1,7 +1,7 @@ -package ervu_dashboard.security.config; +package ervu_business_metrics.security.config; -import ervu_dashboard.security.filter.JwtAuthenticationFilter; -import ervu_dashboard.security.provider.ErvuJwtAuthenticationProvider; +import ervu_business_metrics.security.filter.JwtAuthenticationFilter; +import ervu_business_metrics.security.provider.ErvuJwtAuthenticationProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/backend/src/main/java/ervu_business_metrics/security/context/SecurityContext.java b/backend/src/main/java/ervu_business_metrics/security/context/SecurityContext.java new file mode 100644 index 0000000..2b09503 --- /dev/null +++ b/backend/src/main/java/ervu_business_metrics/security/context/SecurityContext.java @@ -0,0 +1,8 @@ +package ervu_business_metrics.security.context; + +import ervu_business_metrics.security.model.jwt.UserSession; + +public interface SecurityContext { + String getRecruitmentId(); + UserSession getUserSession(); +} diff --git a/backend/src/main/java/ervu_dashboard/security/context/SecurityContextImpl.java b/backend/src/main/java/ervu_business_metrics/security/context/SecurityContextImpl.java similarity index 81% rename from backend/src/main/java/ervu_dashboard/security/context/SecurityContextImpl.java rename to backend/src/main/java/ervu_business_metrics/security/context/SecurityContextImpl.java index bdf884f..44764b8 100644 --- a/backend/src/main/java/ervu_dashboard/security/context/SecurityContextImpl.java +++ b/backend/src/main/java/ervu_business_metrics/security/context/SecurityContextImpl.java @@ -1,7 +1,7 @@ -package ervu_dashboard.security.context; +package ervu_business_metrics.security.context; -import ervu_dashboard.security.model.jwt.UserSession; -import ervu_dashboard.security.model.jwt.authentication.JwtTokenAuthentication; +import ervu_business_metrics.security.model.jwt.UserSession; +import ervu_business_metrics.security.model.jwt.authentication.JwtTokenAuthentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/ervu_dashboard/security/controller/AuthorizationController.java b/backend/src/main/java/ervu_business_metrics/security/controller/AuthorizationController.java similarity index 72% rename from backend/src/main/java/ervu_dashboard/security/controller/AuthorizationController.java rename to backend/src/main/java/ervu_business_metrics/security/controller/AuthorizationController.java index e83e0b4..41f9e5e 100644 --- a/backend/src/main/java/ervu_dashboard/security/controller/AuthorizationController.java +++ b/backend/src/main/java/ervu_business_metrics/security/controller/AuthorizationController.java @@ -1,11 +1,11 @@ -package ervu_dashboard.security.controller; +package ervu_business_metrics.security.controller; import java.util.stream.Collectors; -import ervu_dashboard.security.dto.SessionDto; -import ervu_dashboard.security.model.jwt.UserSession; -import ervu_dashboard.security.context.SecurityContext; -import ervu_dashboard.security.model.role.ErvuRoleAuthority; +import ervu_business_metrics.security.dto.SessionDto; +import ervu_business_metrics.security.model.jwt.UserSession; +import ervu_business_metrics.security.context.SecurityContext; +import ervu_business_metrics.security.model.role.ErvuRoleAuthority; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/backend/src/main/java/ervu_dashboard/security/dto/SessionDto.java b/backend/src/main/java/ervu_business_metrics/security/dto/SessionDto.java similarity index 75% rename from backend/src/main/java/ervu_dashboard/security/dto/SessionDto.java rename to backend/src/main/java/ervu_business_metrics/security/dto/SessionDto.java index 35d586c..db7995a 100644 --- a/backend/src/main/java/ervu_dashboard/security/dto/SessionDto.java +++ b/backend/src/main/java/ervu_business_metrics/security/dto/SessionDto.java @@ -1,4 +1,4 @@ -package ervu_dashboard.security.dto; +package ervu_business_metrics.security.dto; import java.util.Set; diff --git a/backend/src/main/java/ervu_dashboard/security/filter/JwtAuthenticationFilter.java b/backend/src/main/java/ervu_business_metrics/security/filter/JwtAuthenticationFilter.java similarity index 94% rename from backend/src/main/java/ervu_dashboard/security/filter/JwtAuthenticationFilter.java rename to backend/src/main/java/ervu_business_metrics/security/filter/JwtAuthenticationFilter.java index 03e43d0..eff5b06 100644 --- a/backend/src/main/java/ervu_dashboard/security/filter/JwtAuthenticationFilter.java +++ b/backend/src/main/java/ervu_business_metrics/security/filter/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package ervu_dashboard.security.filter; +package ervu_business_metrics.security.filter; import java.io.IOException; import java.net.URLDecoder; @@ -9,7 +9,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import ervu_dashboard.security.model.jwt.authentication.JwtTokenDummy; +import ervu_business_metrics.security.model.jwt.authentication.JwtTokenDummy; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.CredentialsExpiredException; import org.springframework.security.core.Authentication; diff --git a/backend/src/main/java/ervu_dashboard/security/model/jwt/UserSession.java b/backend/src/main/java/ervu_business_metrics/security/model/jwt/UserSession.java similarity index 90% rename from backend/src/main/java/ervu_dashboard/security/model/jwt/UserSession.java rename to backend/src/main/java/ervu_business_metrics/security/model/jwt/UserSession.java index 3d5123c..be59fe3 100644 --- a/backend/src/main/java/ervu_dashboard/security/model/jwt/UserSession.java +++ b/backend/src/main/java/ervu_business_metrics/security/model/jwt/UserSession.java @@ -1,8 +1,8 @@ -package ervu_dashboard.security.model.jwt; +package ervu_business_metrics.security.model.jwt; import java.util.Set; -import ervu_dashboard.security.model.role.ErvuRoleAuthority; +import ervu_business_metrics.security.model.role.ErvuRoleAuthority; public record UserSession( String name, diff --git a/backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenAuthentication.java b/backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenAuthentication.java similarity index 88% rename from backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenAuthentication.java rename to backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenAuthentication.java index b5aea43..20bf2ad 100644 --- a/backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenAuthentication.java +++ b/backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenAuthentication.java @@ -1,8 +1,8 @@ -package ervu_dashboard.security.model.jwt.authentication; +package ervu_business_metrics.security.model.jwt.authentication; import java.util.Collection; -import ervu_dashboard.security.model.jwt.UserSession; +import ervu_business_metrics.security.model.jwt.UserSession; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenDummy.java b/backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenDummy.java similarity index 91% rename from backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenDummy.java rename to backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenDummy.java index 5622a36..247a45d 100644 --- a/backend/src/main/java/ervu_dashboard/security/model/jwt/authentication/JwtTokenDummy.java +++ b/backend/src/main/java/ervu_business_metrics/security/model/jwt/authentication/JwtTokenDummy.java @@ -1,8 +1,7 @@ -package ervu_dashboard.security.model.jwt.authentication; +package ervu_business_metrics.security.model.jwt.authentication; import java.util.Collection; -import ervu_dashboard.security.model.role.ErvuRoleAuthority; import org.apache.commons.lang3.NotImplementedException; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/backend/src/main/java/ervu_dashboard/security/model/role/ErvuRoleAuthority.java b/backend/src/main/java/ervu_business_metrics/security/model/role/ErvuRoleAuthority.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/security/model/role/ErvuRoleAuthority.java rename to backend/src/main/java/ervu_business_metrics/security/model/role/ErvuRoleAuthority.java index 7ecb0a9..6f1beac 100644 --- a/backend/src/main/java/ervu_dashboard/security/model/role/ErvuRoleAuthority.java +++ b/backend/src/main/java/ervu_business_metrics/security/model/role/ErvuRoleAuthority.java @@ -1,4 +1,4 @@ -package ervu_dashboard.security.model.role; +package ervu_business_metrics.security.model.role; import org.springframework.security.core.GrantedAuthority; diff --git a/backend/src/main/java/ervu_dashboard/security/provider/ErvuJwtAuthenticationProvider.java b/backend/src/main/java/ervu_business_metrics/security/provider/ErvuJwtAuthenticationProvider.java similarity index 74% rename from backend/src/main/java/ervu_dashboard/security/provider/ErvuJwtAuthenticationProvider.java rename to backend/src/main/java/ervu_business_metrics/security/provider/ErvuJwtAuthenticationProvider.java index f743292..2d0e2fb 100644 --- a/backend/src/main/java/ervu_dashboard/security/provider/ErvuJwtAuthenticationProvider.java +++ b/backend/src/main/java/ervu_business_metrics/security/provider/ErvuJwtAuthenticationProvider.java @@ -1,9 +1,9 @@ -package ervu_dashboard.security.provider; +package ervu_business_metrics.security.provider; -import ervu_dashboard.security.model.jwt.UserSession; -import ervu_dashboard.security.model.jwt.authentication.JwtTokenAuthentication; -import ervu_dashboard.security.model.jwt.authentication.JwtTokenDummy; -import ervu_dashboard.security.service.JwtTokenService; +import ervu_business_metrics.security.model.jwt.UserSession; +import ervu_business_metrics.security.model.jwt.authentication.JwtTokenAuthentication; +import ervu_business_metrics.security.model.jwt.authentication.JwtTokenDummy; +import ervu_business_metrics.security.service.JwtTokenService; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; diff --git a/backend/src/main/java/ervu_dashboard/security/service/ErvuJwtTokenService.java b/backend/src/main/java/ervu_business_metrics/security/service/ErvuJwtTokenService.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/security/service/ErvuJwtTokenService.java rename to backend/src/main/java/ervu_business_metrics/security/service/ErvuJwtTokenService.java index 9b62a04..4c9d087 100644 --- a/backend/src/main/java/ervu_dashboard/security/service/ErvuJwtTokenService.java +++ b/backend/src/main/java/ervu_business_metrics/security/service/ErvuJwtTokenService.java @@ -1,4 +1,4 @@ -package ervu_dashboard.security.service; +package ervu_business_metrics.security.service; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -7,8 +7,8 @@ import java.util.stream.Collectors; import javax.crypto.SecretKey; -import ervu_dashboard.security.model.jwt.UserSession; -import ervu_dashboard.security.model.role.ErvuRoleAuthority; +import ervu_business_metrics.security.model.jwt.UserSession; +import ervu_business_metrics.security.model.role.ErvuRoleAuthority; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; diff --git a/backend/src/main/java/ervu_business_metrics/security/service/JwtTokenService.java b/backend/src/main/java/ervu_business_metrics/security/service/JwtTokenService.java new file mode 100644 index 0000000..319fc9e --- /dev/null +++ b/backend/src/main/java/ervu_business_metrics/security/service/JwtTokenService.java @@ -0,0 +1,7 @@ +package ervu_business_metrics.security.service; + +import ervu_business_metrics.security.model.jwt.UserSession; + +public interface JwtTokenService { + UserSession getUserSession(String token); +} diff --git a/backend/src/main/java/ervu_dashboard/security/context/SecurityContext.java b/backend/src/main/java/ervu_dashboard/security/context/SecurityContext.java deleted file mode 100644 index d8f50c4..0000000 --- a/backend/src/main/java/ervu_dashboard/security/context/SecurityContext.java +++ /dev/null @@ -1,8 +0,0 @@ -package ervu_dashboard.security.context; - -import ervu_dashboard.security.model.jwt.UserSession; - -public interface SecurityContext { - String getRecruitmentId(); - UserSession getUserSession(); -} diff --git a/backend/src/main/java/ervu_dashboard/security/service/JwtTokenService.java b/backend/src/main/java/ervu_dashboard/security/service/JwtTokenService.java deleted file mode 100644 index a3fadba..0000000 --- a/backend/src/main/java/ervu_dashboard/security/service/JwtTokenService.java +++ /dev/null @@ -1,7 +0,0 @@ -package ervu_dashboard.security.service; - -import ervu_dashboard.security.model.jwt.UserSession; - -public interface JwtTokenService { - UserSession getUserSession(String token); -} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/DefaultCatalog.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/DefaultCatalog.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/DefaultCatalog.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/DefaultCatalog.java index 784489c..6de787f 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/DefaultCatalog.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/DefaultCatalog.java @@ -1,13 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans; +package ru.micord.webbpm.ervu.business_metrics.db_beans; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.ErvuBusinessMetrics; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.Arrays; import java.util.List; @@ -15,6 +11,10 @@ import org.jooq.Constants; import org.jooq.Schema; import org.jooq.impl.CatalogImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.ErvuBusinessMetrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java similarity index 79% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java index 2840c14..1345955 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/ErvuBusinessMetrics.java @@ -1,13 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics; -import ervu_dashboard.ervu_dashboard.db_beans.DefaultCatalog; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangelog; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangeloglock; - import java.util.Arrays; import java.util.List; @@ -15,6 +11,10 @@ import org.jooq.Catalog; import org.jooq.Table; import org.jooq.impl.SchemaImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.DefaultCatalog; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangelog; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangeloglock; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Keys.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Keys.java similarity index 72% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Keys.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Keys.java index 270311f..ef5a67d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Keys.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Keys.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangeloglock; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.records.DatabasechangeloglockRecord; - import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangeloglock; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.records.DatabasechangeloglockRecord; + /** * A class modelling foreign key relationships and constraints of tables in diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Tables.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Tables.java similarity index 67% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Tables.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Tables.java index 8041eda..b51ad7b 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/Tables.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/Tables.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangelog; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangeloglock; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangelog; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangeloglock; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangelog.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangelog.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangelog.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangelog.java index 81bcd2f..9a24326 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangelog.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangelog.java @@ -1,12 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.ErvuBusinessMetrics; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.records.DatabasechangelogRecord; - import java.sql.Timestamp; import java.util.Collection; @@ -26,6 +23,9 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.ErvuBusinessMetrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.records.DatabasechangelogRecord; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java similarity index 94% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java index 4c673f9..6b9b6ab 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/Databasechangeloglock.java @@ -1,13 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.ErvuBusinessMetrics; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.records.DatabasechangeloglockRecord; - import java.sql.Timestamp; import java.util.Collection; @@ -28,6 +24,10 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.ErvuBusinessMetrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.records.DatabasechangeloglockRecord; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java similarity index 97% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java index ab876b7..fb5885e 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangelogRecord.java @@ -1,15 +1,15 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangelog; - import java.sql.Timestamp; import org.jooq.impl.TableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangelog; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java index d86d637..a7075d9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/ervu_business_metrics/tables/records/DatabasechangeloglockRecord.java @@ -1,16 +1,16 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_business_metrics.tables.Databasechangeloglock; - import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.ervu_business_metrics.tables.Databasechangeloglock; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/InitRegistrationInfo.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/InitRegistrationInfo.java similarity index 79% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/InitRegistrationInfo.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/InitRegistrationInfo.java index 2cb2adc..8320820 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/InitRegistrationInfo.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/InitRegistrationInfo.java @@ -1,19 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info; -import ervu_dashboard.ervu_dashboard.db_beans.DefaultCatalog; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.CitizensNextYearAge; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.DecisionFormationStatus; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.IncidentsInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; - import java.util.Arrays; import java.util.List; @@ -22,6 +12,16 @@ import org.jooq.Sequence; import org.jooq.Table; import org.jooq.impl.SchemaImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.DefaultCatalog; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.CitizensNextYearAge; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.DecisionFormationStatus; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.IncidentsInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Keys.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Keys.java similarity index 64% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Keys.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Keys.java index 4a94257..34bedf2 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Keys.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Keys.java @@ -1,34 +1,34 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.CitizensNextYearAge; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.DecisionFormationStatus; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.IncidentsInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.ApplicationsReceivedFromEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.CitizensNextYearAgeRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.DecisionFormationStatusRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.IncidentsInfoRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.InfoSentToLkEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.InitRegistrationFromGirVuRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.RecordsInfoIdUkIdErnRecord; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.StatusesDecisionsOnEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.RecruitmentRecord; - import org.jooq.ForeignKey; import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.CitizensNextYearAge; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.DecisionFormationStatus; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.IncidentsInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.ApplicationsReceivedFromEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.CitizensNextYearAgeRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.DecisionFormationStatusRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.IncidentsInfoRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.InfoSentToLkEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.InitRegistrationFromGirVuRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.RecordsInfoIdUkIdErnRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.StatusesDecisionsOnEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.RecruitmentRecord; + /** * A class modelling foreign key relationships and constraints of tables in @@ -54,12 +54,12 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey APPLICATIONS_RECEIVED_FROM_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(ApplicationsReceivedFromEpgu.APPLICATIONS_RECEIVED_FROM_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { ApplicationsReceivedFromEpgu.APPLICATIONS_RECEIVED_FROM_EPGU.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey CITIZENS_NEXT_YEAR_AGE__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(CitizensNextYearAge.CITIZENS_NEXT_YEAR_AGE, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { CitizensNextYearAge.CITIZENS_NEXT_YEAR_AGE.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey DECISION_FORMATION_STATUS__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(DecisionFormationStatus.DECISION_FORMATION_STATUS, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { DecisionFormationStatus.DECISION_FORMATION_STATUS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey INCIDENTS_INFO__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(IncidentsInfo.INCIDENTS_INFO, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { IncidentsInfo.INCIDENTS_INFO.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey INFO_SENT_TO_LK_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(InfoSentToLkEpgu.INFO_SENT_TO_LK_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { InfoSentToLkEpgu.INFO_SENT_TO_LK_EPGU.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey INIT_REGISTRATION_FROM_GIR_VU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(InitRegistrationFromGirVu.INIT_REGISTRATION_FROM_GIR_VU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { InitRegistrationFromGirVu.INIT_REGISTRATION_FROM_GIR_VU.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey RECORDS_INFO_ID_UK_ID_ERN__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(RecordsInfoIdUkIdErn.RECORDS_INFO_ID_UK_ID_ERN, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { RecordsInfoIdUkIdErn.RECORDS_INFO_ID_UK_ID_ERN.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final ForeignKey STATUSES_DECISIONS_ON_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(StatusesDecisionsOnEpgu.STATUSES_DECISIONS_ON_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { StatusesDecisionsOnEpgu.STATUSES_DECISIONS_ON_EPGU.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey APPLICATIONS_RECEIVED_FROM_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(ApplicationsReceivedFromEpgu.APPLICATIONS_RECEIVED_FROM_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { ApplicationsReceivedFromEpgu.APPLICATIONS_RECEIVED_FROM_EPGU.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey CITIZENS_NEXT_YEAR_AGE__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(CitizensNextYearAge.CITIZENS_NEXT_YEAR_AGE, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { CitizensNextYearAge.CITIZENS_NEXT_YEAR_AGE.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey DECISION_FORMATION_STATUS__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(DecisionFormationStatus.DECISION_FORMATION_STATUS, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { DecisionFormationStatus.DECISION_FORMATION_STATUS.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey INCIDENTS_INFO__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(IncidentsInfo.INCIDENTS_INFO, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { IncidentsInfo.INCIDENTS_INFO.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey INFO_SENT_TO_LK_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(InfoSentToLkEpgu.INFO_SENT_TO_LK_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { InfoSentToLkEpgu.INFO_SENT_TO_LK_EPGU.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey INIT_REGISTRATION_FROM_GIR_VU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(InitRegistrationFromGirVu.INIT_REGISTRATION_FROM_GIR_VU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { InitRegistrationFromGirVu.INIT_REGISTRATION_FROM_GIR_VU.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey RECORDS_INFO_ID_UK_ID_ERN__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(RecordsInfoIdUkIdErn.RECORDS_INFO_ID_UK_ID_ERN, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { RecordsInfoIdUkIdErn.RECORDS_INFO_ID_UK_ID_ERN.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); + public static final ForeignKey STATUSES_DECISIONS_ON_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(StatusesDecisionsOnEpgu.STATUSES_DECISIONS_ON_EPGU, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { StatusesDecisionsOnEpgu.STATUSES_DECISIONS_ON_EPGU.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Sequences.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Sequences.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Sequences.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Sequences.java index 0e43b19..8d01069 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Sequences.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Sequences.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info; import org.jooq.Sequence; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Tables.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Tables.java similarity index 73% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Tables.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Tables.java index 8aef5f8..78f81aa 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/Tables.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/Tables.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.CitizensNextYearAge; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.DecisionFormationStatus; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.IncidentsInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.CitizensNextYearAge; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.DecisionFormationStatus; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.IncidentsInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java index ff6e67a..4c68a25 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ApplicationsReceivedFromEpgu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.ApplicationsReceivedFromEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.ApplicationsReceivedFromEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Первоначальная постановка на учет по diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/CitizensNextYearAge.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/CitizensNextYearAge.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/CitizensNextYearAge.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/CitizensNextYearAge.java index 943fb36..c3a33c6 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/CitizensNextYearAge.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/CitizensNextYearAge.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.CitizensNextYearAgeRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.CitizensNextYearAgeRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Данные по количеству гражан на учете в diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/DecisionFormationStatus.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/DecisionFormationStatus.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/DecisionFormationStatus.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/DecisionFormationStatus.java index 1f5412c..1216a17 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/DecisionFormationStatus.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/DecisionFormationStatus.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.DecisionFormationStatusRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.DecisionFormationStatusRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Статус формирования решений diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/IncidentsInfo.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/IncidentsInfo.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/IncidentsInfo.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/IncidentsInfo.java index def88d9..9122822 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/IncidentsInfo.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/IncidentsInfo.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.IncidentsInfoRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.IncidentsInfoRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Инциденты diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java index 5e6e56d..d6f10c1 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InfoSentToLkEpgu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.InfoSentToLkEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.InfoSentToLkEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. ДОставка уведомлений в ЛК на ЕПГУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java index abd6113..5957aa7 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/InitRegistrationFromGirVu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.InitRegistrationFromGirVuRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.InitRegistrationFromGirVuRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Первоначальная постановка на учет по diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java index 62bfe7b..2e4f9e0 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/RecordsInfoIdUkIdErn.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.RecordsInfoIdUkIdErnRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.RecordsInfoIdUkIdErnRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Информация о налиции ИД ЕРН и ИД УК diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java index 9243340..e1654a6 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/StatusesDecisionsOnEpgu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.InitRegistrationInfo; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records.StatusesDecisionsOnEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.InitRegistrationInfo; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records.StatusesDecisionsOnEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; + /** * Первоначальная постановка на учет. Статусы решений по Первоначальной diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java similarity index 97% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java index 4109d44..9d84bb4 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/ApplicationsReceivedFromEpguRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu; + /** * Первоначальная постановка на учет. Первоначальная постановка на учет по diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java index 1db3a2d..2e713dc 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/CitizensNextYearAgeRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.CitizensNextYearAge; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.CitizensNextYearAge; + /** * Первоначальная постановка на учет. Данные по количеству гражан на учете в diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java index 49e4bba..cc4b02a 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/DecisionFormationStatusRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.DecisionFormationStatus; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.DecisionFormationStatus; + /** * Первоначальная постановка на учет. Статус формирования решений diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java index 015a88f..d818028 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/IncidentsInfoRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.IncidentsInfo; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.IncidentsInfo; + /** * Первоначальная постановка на учет. Инциденты diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java similarity index 97% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java index 8dc310a..6b8d94d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InfoSentToLkEpguRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InfoSentToLkEpgu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InfoSentToLkEpgu; + /** * Первоначальная постановка на учет. ДОставка уведомлений в ЛК на ЕПГУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java index 09fb59b..5aaa3a8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/InitRegistrationFromGirVuRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InitRegistrationFromGirVu; + /** * Первоначальная постановка на учет. Первоначальная постановка на учет по diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java index 1a186a2..1c6a7e2 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn; + /** * Первоначальная постановка на учет. Информация о налиции ИД ЕРН и ИД УК diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java index 05e45a7..87fc497 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/StatusesDecisionsOnEpguRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu; + /** * Первоначальная постановка на учет. Статусы решений по Первоначальной diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Keys.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Keys.java similarity index 80% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Keys.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Keys.java index 2338ec0..9304078 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Keys.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Keys.java @@ -1,32 +1,32 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoCommonResults; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoLoadedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Region; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoCommonResultsRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoComparisonCsvXmlRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoLoadedRecordsRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoNotIdentifitedRecordsRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoRecordsFromEasuRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoSentToLkEpguRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.RecruitmentRecord; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.RegionRecord; - import org.jooq.ForeignKey; import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; import org.jooq.impl.Internal; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoCommonResults; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoLoadedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoCommonResultsRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoComparisonCsvXmlRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoLoadedRecordsRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoNotIdentifitedRecordsRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoRecordsFromEasuRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoSentToLkEpguRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.RecruitmentRecord; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.RegionRecord; + /** * A class modelling foreign key relationships and constraints of tables in diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Metrics.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Metrics.java similarity index 79% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Metrics.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Metrics.java index 641b2d6..8bc0c2a 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Metrics.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Metrics.java @@ -1,19 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics; -import ervu_dashboard.ervu_dashboard.db_beans.DefaultCatalog; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoCommonResults; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoLoadedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Region; - import java.util.Arrays; import java.util.List; @@ -22,6 +12,16 @@ import org.jooq.Sequence; import org.jooq.Table; import org.jooq.impl.SchemaImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.DefaultCatalog; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoCommonResults; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoLoadedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Routines.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Routines.java similarity index 86% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Routines.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Routines.java index ab2c001..6cfcde1 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Routines.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Routines.java @@ -1,25 +1,25 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidGenerateV1; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidGenerateV1mc; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidGenerateV3; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidGenerateV4; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidGenerateV5; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidNil; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidNsDns; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidNsOid; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidNsUrl; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.routines.UuidNsX500; - import java.util.UUID; import org.jooq.Configuration; import org.jooq.Field; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidGenerateV1; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidGenerateV1mc; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidGenerateV3; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidGenerateV4; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidGenerateV5; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidNil; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidNsDns; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidNsOid; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidNsUrl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines.UuidNsX500; + /** * Convenience access to all stored procedures and functions in metrics. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Sequences.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Sequences.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Sequences.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Sequences.java index 219462d..fd9ef31 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Sequences.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Sequences.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics; import org.jooq.Sequence; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Tables.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Tables.java similarity index 69% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Tables.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Tables.java index 9f05e66..bac197b 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/Tables.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Tables.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoCommonResults; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoLoadedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Region; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoCommonResults; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoLoadedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1.java index ad20b8b..1a20268 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1mc.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1mc.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1mc.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1mc.java index 322c87a..a6a3af9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV1mc.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV1mc.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV3.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV3.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV3.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV3.java index e1293a1..b17315b 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV3.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV3.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Field; @@ -14,6 +12,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV4.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV4.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV4.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV4.java index 66dc066..0c63a83 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV4.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV4.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV5.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV5.java similarity index 93% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV5.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV5.java index ebaef51..8cf0471 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidGenerateV5.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidGenerateV5.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Field; @@ -14,6 +12,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNil.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNil.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNil.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNil.java index 43fda42..32bfcf0 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNil.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNil.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsDns.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsDns.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsDns.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsDns.java index aa21edb..25e2f70 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsDns.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsDns.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsOid.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsOid.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsOid.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsOid.java index ad6297e..a135b4c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsOid.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsOid.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsUrl.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsUrl.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsUrl.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsUrl.java index 5d5f39c..2f798ec 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsUrl.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsUrl.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsX500.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsX500.java similarity index 84% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsX500.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsX500.java index c003b49..c9e52af 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/routines/UuidNsX500.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/routines/UuidNsX500.java @@ -1,11 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.routines; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.routines; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; - import java.util.UUID; import org.jooq.Parameter; @@ -13,6 +11,8 @@ import org.jooq.impl.AbstractRoutine; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoCommonResults.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoCommonResults.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoCommonResults.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoCommonResults.java index eb3f899..b3b0b77 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoCommonResults.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoCommonResults.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoCommonResultsRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoCommonResultsRecord; + /** * Конвертация. Результаты diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java index 86771f0..95137f3 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoComparisonCsvXml.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoComparisonCsvXmlRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoComparisonCsvXmlRecord; + /** * Конвертация. Результат сопоставления файлов diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoLoadedRecords.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoLoadedRecords.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java index c736223..c6d22ae 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoLoadedRecords.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoLoadedRecordsRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoLoadedRecordsRecord; + /** * загрузка записей в ГИС ЕРВУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java index ae069ce..1699d32 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoNotIdentifitedRecords.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoNotIdentifitedRecordsRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoNotIdentifitedRecordsRecord; + /** * записи неидентифицированные в ГИР ВУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java index cc472be..02cbfa4 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoRecordsFromEasuRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoRecordsFromEasuRecord; + /** * Загрузка Данных из ЕАСУ "ГОризонт-М" diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java index 66b50dc..30620c5 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoSentToLkEpgu.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.ConvertInfoSentToLkEpguRecord; - import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; @@ -37,6 +32,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ConvertInfoSentToLkEpguRecord; + /** * Конвертация. ДОставка уведомлений в ЛК на ЕПГУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Recruitment.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java similarity index 86% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Recruitment.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java index 4852293..c033456 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Recruitment.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java @@ -1,28 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu.ApplicationsReceivedFromEpguPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.CitizensNextYearAge.CitizensNextYearAgePath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.DecisionFormationStatus.DecisionFormationStatusPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.IncidentsInfo.IncidentsInfoPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InfoSentToLkEpgu.InfoSentToLkEpguPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.InitRegistrationFromGirVu.InitRegistrationFromGirVuPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn.RecordsInfoIdUkIdErnPath; -import ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu.StatusesDecisionsOnEpguPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoCommonResults.ConvertInfoCommonResultsPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoComparisonCsvXml.ConvertInfoComparisonCsvXmlPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoLoadedRecords.ConvertInfoLoadedRecordsPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords.ConvertInfoNotIdentifitedRecordsPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoRecordsFromEasu.ConvertInfoRecordsFromEasuPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoSentToLkEpgu.ConvertInfoSentToLkEpguPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Region.RegionPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.RecruitmentRecord; - import java.sql.Timestamp; import java.util.Arrays; import java.util.Collection; @@ -49,6 +30,25 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.ApplicationsReceivedFromEpgu.ApplicationsReceivedFromEpguPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.CitizensNextYearAge.CitizensNextYearAgePath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.DecisionFormationStatus.DecisionFormationStatusPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.IncidentsInfo.IncidentsInfoPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InfoSentToLkEpgu.InfoSentToLkEpguPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.InitRegistrationFromGirVu.InitRegistrationFromGirVuPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.RecordsInfoIdUkIdErn.RecordsInfoIdUkIdErnPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.tables.StatusesDecisionsOnEpgu.StatusesDecisionsOnEpguPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoCommonResults.ConvertInfoCommonResultsPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoComparisonCsvXml.ConvertInfoComparisonCsvXmlPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoLoadedRecords.ConvertInfoLoadedRecordsPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords.ConvertInfoNotIdentifitedRecordsPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoRecordsFromEasu.ConvertInfoRecordsFromEasuPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoSentToLkEpgu.ConvertInfoSentToLkEpguPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region.RegionPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.RecruitmentRecord; + /** * Военный комиссариат @@ -359,7 +359,7 @@ public class Recruitment extends TableImpl { */ public ApplicationsReceivedFromEpguPath applicationsReceivedFromEpgu() { if (_applicationsReceivedFromEpgu == null) - _applicationsReceivedFromEpgu = new ApplicationsReceivedFromEpguPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.APPLICATIONS_RECEIVED_FROM_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _applicationsReceivedFromEpgu = new ApplicationsReceivedFromEpguPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.APPLICATIONS_RECEIVED_FROM_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _applicationsReceivedFromEpgu; } @@ -372,7 +372,7 @@ public class Recruitment extends TableImpl { */ public CitizensNextYearAgePath citizensNextYearAge() { if (_citizensNextYearAge == null) - _citizensNextYearAge = new CitizensNextYearAgePath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.CITIZENS_NEXT_YEAR_AGE__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _citizensNextYearAge = new CitizensNextYearAgePath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.CITIZENS_NEXT_YEAR_AGE__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _citizensNextYearAge; } @@ -385,7 +385,7 @@ public class Recruitment extends TableImpl { */ public DecisionFormationStatusPath decisionFormationStatus() { if (_decisionFormationStatus == null) - _decisionFormationStatus = new DecisionFormationStatusPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.DECISION_FORMATION_STATUS__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _decisionFormationStatus = new DecisionFormationStatusPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.DECISION_FORMATION_STATUS__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _decisionFormationStatus; } @@ -398,7 +398,7 @@ public class Recruitment extends TableImpl { */ public IncidentsInfoPath incidentsInfo() { if (_incidentsInfo == null) - _incidentsInfo = new IncidentsInfoPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.INCIDENTS_INFO__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _incidentsInfo = new IncidentsInfoPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.INCIDENTS_INFO__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _incidentsInfo; } @@ -411,7 +411,7 @@ public class Recruitment extends TableImpl { */ public InfoSentToLkEpguPath infoSentToLkEpgu() { if (_infoSentToLkEpgu == null) - _infoSentToLkEpgu = new InfoSentToLkEpguPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.INFO_SENT_TO_LK_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _infoSentToLkEpgu = new InfoSentToLkEpguPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.INFO_SENT_TO_LK_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _infoSentToLkEpgu; } @@ -424,7 +424,7 @@ public class Recruitment extends TableImpl { */ public InitRegistrationFromGirVuPath initRegistrationFromGirVu() { if (_initRegistrationFromGirVu == null) - _initRegistrationFromGirVu = new InitRegistrationFromGirVuPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.INIT_REGISTRATION_FROM_GIR_VU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _initRegistrationFromGirVu = new InitRegistrationFromGirVuPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.INIT_REGISTRATION_FROM_GIR_VU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _initRegistrationFromGirVu; } @@ -437,7 +437,7 @@ public class Recruitment extends TableImpl { */ public RecordsInfoIdUkIdErnPath recordsInfoIdUkIdErn() { if (_recordsInfoIdUkIdErn == null) - _recordsInfoIdUkIdErn = new RecordsInfoIdUkIdErnPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.RECORDS_INFO_ID_UK_ID_ERN__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _recordsInfoIdUkIdErn = new RecordsInfoIdUkIdErnPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.RECORDS_INFO_ID_UK_ID_ERN__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _recordsInfoIdUkIdErn; } @@ -450,7 +450,7 @@ public class Recruitment extends TableImpl { */ public StatusesDecisionsOnEpguPath statusesDecisionsOnEpgu() { if (_statusesDecisionsOnEpgu == null) - _statusesDecisionsOnEpgu = new StatusesDecisionsOnEpguPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.init_registration_info.Keys.STATUSES_DECISIONS_ON_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); + _statusesDecisionsOnEpgu = new StatusesDecisionsOnEpguPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.init_registration_info.Keys.STATUSES_DECISIONS_ON_EPGU__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID.getInverseKey()); return _statusesDecisionsOnEpgu; } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Region.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Region.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Region.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Region.java index 17ad868..d3b919a 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/Region.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Region.java @@ -1,14 +1,9 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Keys; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.Metrics; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment.RecruitmentPath; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records.RegionRecord; - import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -35,6 +30,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.RegionRecord; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java index a648dff..e6d737a 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoCommonResultsRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoCommonResults; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoCommonResults; + /** * Конвертация. Результаты diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java index 28b1d10..170b6c3 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoComparisonCsvXmlRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoComparisonCsvXml; + /** * Конвертация. Результат сопоставления файлов diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java index a62ecf9..7930bce 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoLoadedRecords; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoLoadedRecords; + /** * загрузка записей в ГИС ЕРВУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java similarity index 95% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java index fe082e7..76c2acb 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoNotIdentifitedRecordsRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoNotIdentifitedRecords; + /** * записи неидентифицированные в ГИР ВУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java similarity index 96% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java index 20e22a5..3baacdc 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoRecordsFromEasu; + /** * Загрузка Данных из ЕАСУ "ГОризонт-М" diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java similarity index 97% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java index 93809ec..22b70a6 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoSentToLkEpguRecord.java @@ -1,17 +1,17 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; - import java.sql.Date; import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInfoSentToLkEpgu; + /** * Конвертация. ДОставка уведомлений в ЛК на ЕПГУ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RecruitmentRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RecruitmentRecord.java similarity index 99% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RecruitmentRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RecruitmentRecord.java index e2a97c3..15623af 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RecruitmentRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RecruitmentRecord.java @@ -1,16 +1,16 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Recruitment; - import java.sql.Timestamp; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment; + /** * Военный комиссариат diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RegionRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RegionRecord.java similarity index 94% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RegionRecord.java rename to backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RegionRecord.java index 7767e33..f70171b 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/metrics/tables/records/RegionRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/RegionRecord.java @@ -1,14 +1,14 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.records; +package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records; -import ervu_dashboard.ervu_dashboard.db_beans.metrics.tables.Region; - import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; +import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region; + /** * This class is generated by jOOQ. diff --git a/backend/src/main/resources/config/liquibase.properties b/backend/src/main/resources/config/liquibase.properties deleted file mode 100644 index 1a37b5c..0000000 --- a/backend/src/main/resources/config/liquibase.properties +++ /dev/null @@ -1,6 +0,0 @@ -changelog-file=config/changelog-master.xml -driver=org.postgresql.Driver -url=jdbc:postgresql://10.10.31.119/ervu-dashboard-copy -username=ervu-dashboard -password=ervu-dashboard -defaultSchemaName=public diff --git a/backend/src/main/resources/readme-test.md b/backend/src/main/resources/readme-test.md index 867e53f..6690a9e 100644 --- a/backend/src/main/resources/readme-test.md +++ b/backend/src/main/resources/readme-test.md @@ -3,7 +3,7 @@ ### Запустить миграцию В liquibase.properties указаны свойства для подключения к БД. -Изначально подключение указывается на БД **ervu-dashboard-copy** +Изначально подключение указывается на БД **ervu-business-metrics-copy** Запуск миграции можно производить при запуске студии или командой: @@ -14,4 +14,4 @@ Другой вариант без liquibase.properties #### - liquibase update --default-schema-name=public --url=jdbc:postgresql:`url` --username=`username` --password=`password` --changelogFile=`path` -Для пути к changelogFile укажите путь в котором находится changelog-master.xml \ No newline at end of file +Для пути к changelogFile укажите путь в котором находится changelog-master.xml diff --git a/config.md b/config.md index 077ce1f..61834e2 100644 --- a/config.md +++ b/config.md @@ -67,7 +67,7 @@ Собранный образ фронтенда имеет возможность работать как полноценное standalone приложение, так и как удалённый модуль MFe. Для настройки Mfe следует указать следующие переменные: -* MFE_BASE_URL - указывается frontend/.env, либо в переменных среды сборки приложения. При изменении переменной приложение надо пересобирать. По умолчанию /mfe/dashboard +* MFE_BASE_URL - указывается frontend/.env, либо в переменных среды сборки приложения. При изменении переменной приложение надо пересобирать. По умолчанию /mfe/business-metrics * backend.url - если необходимо настроить url бэкенда, его можно указать в frontend/src/resources/app.config.json diff --git a/frontend/angular.json b/frontend/angular.json index 3993721..5efaabc 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -67,5 +67,5 @@ } } }, - "defaultProject": "ervu-dashboard" + "defaultProject": "ervu_business_metrics" } diff --git a/frontend/index.html b/frontend/index.html index 22b58aa..d9e5e3c 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -18,7 +18,7 @@ }); - +
diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index e9aa8fe..f0cbcdc 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -6,7 +6,7 @@ - +
diff --git a/frontend/preview.html b/frontend/preview.html index 6fe2432..ce4d150 100644 --- a/frontend/preview.html +++ b/frontend/preview.html @@ -18,7 +18,7 @@ }); - +
diff --git a/frontend/src/resources/css/components-business-metrics.css b/frontend/src/resources/css/components-business-metrics.css new file mode 100644 index 0000000..f971595 --- /dev/null +++ b/frontend/src/resources/css/components-business-metrics.css @@ -0,0 +1,301 @@ +@charset "utf-8"; + +.webbpm.ervu_business_metrics label { + width: auto; +} + +.webbpm.ervu_business_metrics .selectize-control { + display: flex; + height: auto; + background-color: transparent; +} +.webbpm.ervu_business_metrics .selectize-control .selectize-input { + min-height: auto; + border: 0; + border-bottom: 1px solid var(--input-border); + border-radius: var(--indent-xmini) var(--indent-xmini) 0 0; + background-color: var(--input-bg); +} +.webbpm.ervu_business_metrics .selectize-control .selectize-input:after { + 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) / 2)); + right: var(--indent-small); + height: auto; + width: auto; + border: 0; +} +.webbpm.ervu_business_metrics .selectize-control .selectize-input > input { + color: var(--color-text-primary); + font-family: 'GolosUI'; +} +.webbpm.ervu_business_metrics .selectize-dropdown { + background-color: transparent; + box-shadow: none; +} +.webbpm.ervu_business_metrics .selectize-dropdown-content { + border: 0; +} + +.webbpm.ervu_business_metrics .block-panel button-component { + position: relative; + display: flex; + width: 16.7%; + min-height: 112px; + padding-right: 0; +} +.webbpm.ervu_business_metrics .block-panel button-component::before { + content: ""; + position: absolute; + right: var(--indent-mini); + top: var(--indent-mini); + width: 64px; + height: 64px; + opacity: 0.3; +} +.webbpm.ervu_business_metrics .block-panel button-component.active::before { + opacity: 0.5; +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(1)::before { + background-image: url(../img/svg/panel/panel-01.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(2)::before { + background-image: url(../img/svg/panel/panel-02.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(3)::before { + background-image: url(../img/svg/panel/panel-03.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(4)::before { + background-image: url(../img/svg/panel/panel-04.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(5)::before { + background-image: url(../img/svg/panel/panel-05.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component:nth-child(6)::before { + background-image: url(../img/svg/panel/panel-06.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(1)::before { + background-image: url(../img/svg/panel/panel-07.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(2)::before { + background-image: url(../img/svg/panel/panel-08.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(3)::before { + background-image: url(../img/svg/panel/panel-09.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(4)::before { + background-image: url(../img/svg/panel/panel-10.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(5)::before { + background-image: url(../img/svg/panel/panel-11.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component:nth-child(6)::before { + background-image: url(../img/svg/panel/panel-12.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(1)::before { + background-image: url(../img/svg/panel/panel-wt-01.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(2)::before { + background-image: url(../img/svg/panel/panel-wt-02.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(3)::before { + background-image: url(../img/svg/panel/panel-wt-03.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(4)::before { + background-image: url(../img/svg/panel/panel-wt-04.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(5)::before { + background-image: url(../img/svg/panel/panel-wt-05.svg); +} +.webbpm.ervu_business_metrics .block-panel button-component.active:nth-child(6)::before { + background-image: url(../img/svg/panel/panel-wt-06.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(1)::before { + background-image: url(../img/svg/panel/panel-wt-07.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(2)::before { + background-image: url(../img/svg/panel/panel-wt-08.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(3)::before { + background-image: url(../img/svg/panel/panel-wt-09.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(4)::before { + background-image: url(../img/svg/panel/panel-wt-10.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(5)::before { + background-image: url(../img/svg/panel/panel-wt-11.svg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel button-component.active:nth-child(6)::before { + background-image: url(../img/svg/panel/panel-wt-12.svg); +} + +.webbpm.ervu_business_metrics .block-panel button-component + button-component { + padding-left: var(--indent-mini); +} +.webbpm.ervu_business_metrics .block-panel button-component:last-child { + width: 16.5%; +} +.webbpm.ervu_business_metrics .block-panel button-component > div { + flex: 1; +} +.webbpm.ervu_business_metrics .block-panel button-component .btn { + display: flex; + align-items: end; + font-family: 'GolosM'; + font-size: var(--size-text-primary); + color: var(--color-text-primary); + text-align: left; + width: 100%; + height: 100%; + padding: var(--indent-base); + margin-bottom: 0; + border: 0; + border-radius: var(--indent-small); + background-color: var(--block-bg); + box-shadow: var(--block-shadow); +} +.webbpm.ervu_business_metrics .block-panel button-component.active .btn { + color: var(--white); + background: var(--block-active-bg); +} +.webbpm.ervu_business_metrics .block-panel + .block-panel, +.webbpm.ervu_business_metrics .group-section + .group-section { + margin-top: var(--indent-mini); +} + +.webbpm.ervu_business_metrics .block-section { + flex: 1; + padding-right: 0; +} +.webbpm.ervu_business_metrics .block-section + .block-section { + padding-left: var(--indent-mini); +} +.webbpm.ervu_business_metrics .block-section > div { + padding: var(--indent-xbase) var(--indent-medium) var(--indent-medium) var(--indent-medium); + border: 1px solid var(--border); + border-radius: var(--indent-small); + background-color: var(--white); + box-shadow: var(--shadow); +} + +.webbpm.ervu_business_metrics .section-header { + font-family: 'GolosM'; + font-size: var(--size-text-subtitle); +} + +.webbpm.ervu_business_metrics :is(.title, .subtitle) { + font-family: 'GolosM'; + font-size: var(--size-text-title); + padding: 0; +} +.webbpm.ervu_business_metrics :is(.title, .subtitle) .form-group { + margin-bottom: 0; +} +.webbpm.ervu_business_metrics .title { + font-size: var(--size-text-title); + margin-top: var(--indent-xlarge); + margin-bottom: var(--indent-base); +} +.webbpm.ervu_business_metrics .subtitle { + font-size: var(--size-text-subtitle); + margin-bottom: var(--indent-base); +} + +.webbpm.ervu_business_metrics .mute { + color: var(--color-text-mute); + font-family: 'Golos'; +} + +.webbpm.ervu_business_metrics .text-invert.mute > div > div:last-of-type { + line-height: inherit !important; + font-size: inherit !important; +} +.webbpm.ervu_business_metrics .text-invert > div { + flex-direction: row-reverse; +} +.webbpm.ervu_business_metrics .text-invert > div label { + width: auto; + padding-left: 2px; + margin-right: 0; +} +.webbpm.ervu_business_metrics .text-invert > div > div:last-of-type { + font-family: 'GolosM'; + overflow: visible; +} + +.webbpm.ervu_business_metrics :is(.graph-donut, .graph-donut-large) { + display: flex; + justify-content: center; +} +.webbpm.ervu_business_metrics .graph-chart .chart-content { + width: min(10vw, 12.5rem); + height: min(7vw, 9rem); +} +.webbpm.ervu_business_metrics .graph-donut .chart-content { + width: 196px; + height: 196px; +} +.webbpm.ervu_business_metrics .graph-donut-medium .chart-content { + +} +.webbpm.ervu_business_metrics .graph-donut-large .chart-content { + +} + +.webbpm.ervu_business_metrics [class*="graph-legend"] * { + margin-bottom: 0; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] [class*="legend-col"] { + position: relative; + padding-left: var(--indent-xbase); +} +.webbpm.ervu_business_metrics [class*="graph-legend"] [class*="legend-col"]::before { + content: ""; + position: absolute; + width: 12px; + height: 12px; + top: 5px; + left: 0; + border-radius: 12px; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-green::before { + background-color: #a3bd9c; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-red::before { + background-color: #e4aaac; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-yellow::before { + background-color: #d4c892; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-blue::before { + background-color: #a0c3f0; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-lila::before { + background-color: #9193b7; +} +.webbpm.ervu_business_metrics [class*="graph-legend"] .legend-col-orange::before { + background-color: #e9decd; +} + +.webbpm.ervu_business_metrics grid-v2 { + flex: 1; + height: auto; +} +.webbpm.ervu_business_metrics .grid { + min-height: 100px; +} + +.webbpm.ervu_business_metrics :is(.ag-overlay-loading-center, .tooltip-default, .tooltip.show .tooltip-inner) { + color: var(--color-text-primary); + font-size: var(--size-text-secondary); + padding: var(--indent-small) var(--indent-base); + border: 0; + border-radius:var(--indent-xbase); + background-color: var(--color-tooltip); +} +.webbpm.ervu_business_metrics .tooltip .arrow { + display: none; +} diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css deleted file mode 100644 index a3922a6..0000000 --- a/frontend/src/resources/css/components-dashboard.css +++ /dev/null @@ -1,301 +0,0 @@ -@charset "utf-8"; - -.webbpm.ervu_dashboard label { - width: auto; -} - -.webbpm.ervu_dashboard .selectize-control { - display: flex; - height: auto; - background-color: transparent; -} -.webbpm.ervu_dashboard .selectize-control .selectize-input { - min-height: auto; - border: 0; - border-bottom: 1px solid var(--input-border); - border-radius: var(--indent-xmini) var(--indent-xmini) 0 0; - background-color: var(--input-bg); -} -.webbpm.ervu_dashboard .selectize-control .selectize-input:after { - 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) / 2)); - right: var(--indent-small); - height: auto; - width: auto; - border: 0; -} -.webbpm.ervu_dashboard .selectize-control .selectize-input > input { - color: var(--color-text-primary); - font-family: 'GolosUI'; -} -.webbpm.ervu_dashboard .selectize-dropdown { - background-color: transparent; - box-shadow: none; -} -.webbpm.ervu_dashboard .selectize-dropdown-content { - border: 0; -} - -.webbpm.ervu_dashboard .block-panel button-component { - position: relative; - display: flex; - width: 16.7%; - min-height: 112px; - padding-right: 0; -} -.webbpm.ervu_dashboard .block-panel button-component::before { - content: ""; - position: absolute; - right: var(--indent-mini); - top: var(--indent-mini); - width: 64px; - height: 64px; - opacity: 0.3; -} -.webbpm.ervu_dashboard .block-panel button-component.active::before { - opacity: 0.5; -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(1)::before { - background-image: url(../img/svg/panel/panel-01.svg); -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(2)::before { - background-image: url(../img/svg/panel/panel-02.svg); -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(3)::before { - background-image: url(../img/svg/panel/panel-03.svg); -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(4)::before { - background-image: url(../img/svg/panel/panel-04.svg); -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(5)::before { - background-image: url(../img/svg/panel/panel-05.svg); -} -.webbpm.ervu_dashboard .block-panel button-component:nth-child(6)::before { - background-image: url(../img/svg/panel/panel-06.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(1)::before { - background-image: url(../img/svg/panel/panel-07.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(2)::before { - background-image: url(../img/svg/panel/panel-08.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(3)::before { - background-image: url(../img/svg/panel/panel-09.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(4)::before { - background-image: url(../img/svg/panel/panel-10.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(5)::before { - background-image: url(../img/svg/panel/panel-11.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component:nth-child(6)::before { - background-image: url(../img/svg/panel/panel-12.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(1)::before { - background-image: url(../img/svg/panel/panel-wt-01.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(2)::before { - background-image: url(../img/svg/panel/panel-wt-02.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(3)::before { - background-image: url(../img/svg/panel/panel-wt-03.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(4)::before { - background-image: url(../img/svg/panel/panel-wt-04.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(5)::before { - background-image: url(../img/svg/panel/panel-wt-05.svg); -} -.webbpm.ervu_dashboard .block-panel button-component.active:nth-child(6)::before { - background-image: url(../img/svg/panel/panel-wt-06.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(1)::before { - background-image: url(../img/svg/panel/panel-wt-07.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(2)::before { - background-image: url(../img/svg/panel/panel-wt-08.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(3)::before { - background-image: url(../img/svg/panel/panel-wt-09.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(4)::before { - background-image: url(../img/svg/panel/panel-wt-10.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(5)::before { - background-image: url(../img/svg/panel/panel-wt-11.svg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel button-component.active:nth-child(6)::before { - background-image: url(../img/svg/panel/panel-wt-12.svg); -} - -.webbpm.ervu_dashboard .block-panel button-component + button-component { - padding-left: var(--indent-mini); -} -.webbpm.ervu_dashboard .block-panel button-component:last-child { - width: 16.5%; -} -.webbpm.ervu_dashboard .block-panel button-component > div { - flex: 1; -} -.webbpm.ervu_dashboard .block-panel button-component .btn { - display: flex; - align-items: end; - font-family: 'GolosM'; - font-size: var(--size-text-primary); - color: var(--color-text-primary); - text-align: left; - width: 100%; - height: 100%; - padding: var(--indent-base); - margin-bottom: 0; - border: 0; - border-radius: var(--indent-small); - background-color: var(--block-bg); - box-shadow: var(--block-shadow); -} -.webbpm.ervu_dashboard .block-panel button-component.active .btn { - color: var(--white); - background: var(--block-active-bg); -} -.webbpm.ervu_dashboard .block-panel + .block-panel, -.webbpm.ervu_dashboard .group-section + .group-section { - margin-top: var(--indent-mini); -} - -.webbpm.ervu_dashboard .block-section { - flex: 1; - padding-right: 0; -} -.webbpm.ervu_dashboard .block-section + .block-section { - padding-left: var(--indent-mini); -} -.webbpm.ervu_dashboard .block-section > div { - padding: var(--indent-xbase) var(--indent-medium) var(--indent-medium) var(--indent-medium); - border: 1px solid var(--border); - border-radius: var(--indent-small); - background-color: var(--white); - box-shadow: var(--shadow); -} - -.webbpm.ervu_dashboard .section-header { - font-family: 'GolosM'; - font-size: var(--size-text-subtitle); -} - -.webbpm.ervu_dashboard :is(.title, .subtitle) { - font-family: 'GolosM'; - font-size: var(--size-text-title); - padding: 0; -} -.webbpm.ervu_dashboard :is(.title, .subtitle) .form-group { - margin-bottom: 0; -} -.webbpm.ervu_dashboard .title { - font-size: var(--size-text-title); - margin-top: var(--indent-xlarge); - margin-bottom: var(--indent-base); -} -.webbpm.ervu_dashboard .subtitle { - font-size: var(--size-text-subtitle); - margin-bottom: var(--indent-base); -} - -.webbpm.ervu_dashboard .mute { - color: var(--color-text-mute); - font-family: 'Golos'; -} - -.webbpm.ervu_dashboard .text-invert.mute > div > div:last-of-type { - line-height: inherit !important; - font-size: inherit !important; -} -.webbpm.ervu_dashboard .text-invert > div { - flex-direction: row-reverse; -} -.webbpm.ervu_dashboard .text-invert > div label { - width: auto; - padding-left: 2px; - margin-right: 0; -} -.webbpm.ervu_dashboard .text-invert > div > div:last-of-type { - font-family: 'GolosM'; - overflow: visible; -} - -.webbpm.ervu_dashboard :is(.graph-donut, .graph-donut-large) { - display: flex; - justify-content: center; -} -.webbpm.ervu_dashboard .graph-chart .chart-content { - width: min(10vw, 12.5rem); - height: min(7vw, 9rem); -} -.webbpm.ervu_dashboard .graph-donut .chart-content { - width: 196px; - height: 196px; -} -.webbpm.ervu_dashboard .graph-donut-medium .chart-content { - -} -.webbpm.ervu_dashboard .graph-donut-large .chart-content { - -} - -.webbpm.ervu_dashboard [class*="graph-legend"] * { - margin-bottom: 0; -} -.webbpm.ervu_dashboard [class*="graph-legend"] [class*="legend-col"] { - position: relative; - padding-left: var(--indent-xbase); -} -.webbpm.ervu_dashboard [class*="graph-legend"] [class*="legend-col"]::before { - content: ""; - position: absolute; - width: 12px; - height: 12px; - top: 5px; - left: 0; - border-radius: 12px; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-green::before { - background-color: #a3bd9c; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-red::before { - background-color: #e4aaac; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-yellow::before { - background-color: #d4c892; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-blue::before { - background-color: #a0c3f0; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-lila::before { - background-color: #9193b7; -} -.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-orange::before { - background-color: #e9decd; -} - -.webbpm.ervu_dashboard grid-v2 { - flex: 1; - height: auto; -} -.webbpm.ervu_dashboard .grid { - min-height: 100px; -} - -.webbpm.ervu_dashboard :is(.ag-overlay-loading-center, .tooltip-default, .tooltip.show .tooltip-inner) { - color: var(--color-text-primary); - font-size: var(--size-text-secondary); - padding: var(--indent-small) var(--indent-base); - border: 0; - border-radius:var(--indent-xbase); - background-color: var(--color-tooltip); -} -.webbpm.ervu_dashboard .tooltip .arrow { - display: none; -} diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-business-metrics.css similarity index 86% rename from frontend/src/resources/css/inbox-dashboard.css rename to frontend/src/resources/css/inbox-business-metrics.css index 58f17b8..75bf431 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-business-metrics.css @@ -1,4 +1,4 @@ -.webbpm.ervu_dashboard { +.webbpm.ervu_business_metrics { --white: #fff; --color-text-primary: #020c12; --color-text-mute: rgba(2, 12, 18, 0.58); @@ -38,19 +38,19 @@ --h-header: 68px; } -.webbpm.ervu_dashboard { +.webbpm.ervu_business_metrics { display: flex; flex-direction: column; color: var(--color-text-primary); font-family: 'Golos'; } -.webbpm.ervu_dashboard .container { +.webbpm.ervu_business_metrics .container { padding: var(--h-header) 0 0; bottom: 0; background-color: var(--page-bg); } -.webbpm.ervu_dashboard .container-inside { +.webbpm.ervu_business_metrics .container-inside { position: relative; font-family: 'GolosUI'; font-size: var(--size-text-primary); @@ -59,18 +59,18 @@ overflow: auto; } -.webbpm.ervu_dashboard .header-logo { +.webbpm.ervu_business_metrics .header-logo { display: flex; flex-direction: row; align-items: center; margin-left: var(--indent-xbase); } -.webbpm.ervu_dashboard .header-logo .logo-title { +.webbpm.ervu_business_metrics .header-logo .logo-title { font-family: 'GolosM'; font-size: var(--size-text-header); } -.webbpm.ervu_dashboard .header { +.webbpm.ervu_business_metrics .header { display: flex; font-family: 'Golos'; font-size: var(--size-text-primary); @@ -80,7 +80,7 @@ min-height: var(--h-header); background-color: var(--header-bg); } -.webbpm.ervu_dashboard .header > div > * { +.webbpm.ervu_business_metrics .header > div > * { position: relative; display: flex; align-items: center; @@ -106,7 +106,7 @@ background-color: transparent; } -.webbpm.ervu_dashboard .progress { +.webbpm.ervu_business_metrics .progress { width: 64px; height: 64px; border: 5px dotted var(--color-text-primary); @@ -117,7 +117,7 @@ box-sizing: border-box; animation: rotation 2.5s linear infinite; } -.webbpm.ervu_dashboard .loader.modal .modal-content { +.webbpm.ervu_business_metrics .loader.modal .modal-content { border: 0; background: transparent; box-shadow: none; @@ -129,4 +129,4 @@ 100% { transform: rotate(360deg); } -} +} diff --git a/frontend/src/resources/css/style.css b/frontend/src/resources/css/style.css index e8c7ce8..3d5cbeb 100644 --- a/frontend/src/resources/css/style.css +++ b/frontend/src/resources/css/style.css @@ -7,8 +7,8 @@ @import "../../../node_modules/@webbpm/base-package/css/style.css"; @import "font-faces.css"; @import "structure.css"; -@import "inbox-dashboard.css"; -@import "components-dashboard.css"; +@import "inbox-business-metrics.css"; +@import "components-business-metrics.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"; diff --git a/frontend/src/resources/template/ervu-dashboard/ErvuChartV2.html b/frontend/src/resources/template/ervu_business_metrics/ErvuChartV2.html similarity index 100% rename from frontend/src/resources/template/ervu-dashboard/ErvuChartV2.html rename to frontend/src/resources/template/ervu_business_metrics/ErvuChartV2.html diff --git a/frontend/src/resources/template/ervu-dashboard/FilterContainer.html b/frontend/src/resources/template/ervu_business_metrics/FilterContainer.html similarity index 100% rename from frontend/src/resources/template/ervu-dashboard/FilterContainer.html rename to frontend/src/resources/template/ervu_business_metrics/FilterContainer.html diff --git a/frontend/src/resources/template/webbpm/mfe-webbpm.html b/frontend/src/resources/template/webbpm/mfe-webbpm.html index 3d4dda0..2ea13d5 100644 --- a/frontend/src/resources/template/webbpm/mfe-webbpm.html +++ b/frontend/src/resources/template/webbpm/mfe-webbpm.html @@ -1,4 +1,4 @@ -
+
diff --git a/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts b/frontend/src/ts/ervu_business_metrics/component/chart/ChartUtils.ts similarity index 91% rename from frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/ChartUtils.ts index a1bce61..2a1fa64 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts +++ b/frontend/src/ts/ervu_business_metrics/component/chart/ChartUtils.ts @@ -1,4 +1,4 @@ -import {Font} from "../../../generated/ervu_dashboard/model/Font"; +import {Font} from "../../../generated/ervu_business_metrics/model/Font"; import {Chart} from "chart.js"; export class ChartUtils { @@ -27,4 +27,4 @@ export class ChartUtils { public static clone(source: T): T { return JSON.parse(JSON.stringify(source)); } -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts b/frontend/src/ts/ervu_business_metrics/component/chart/ErvuChartV2.ts similarity index 98% rename from frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/ErvuChartV2.ts index 70b5e1c..d205221 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts +++ b/frontend/src/ts/ervu_business_metrics/component/chart/ErvuChartV2.ts @@ -26,7 +26,7 @@ import {ChartUtils} from "./ChartUtils"; @Component({ moduleId: module.id, selector: 'ervu-chart-v2', - templateUrl: './../../../../../src/resources/template/ervu-dashboard/ErvuChartV2.html', + templateUrl: './../../../../../src/resources/template/ervu_business_metrics/ErvuChartV2.html', changeDetection: ChangeDetectionStrategy.OnPush }) export class ErvuChartV2 extends Control implements Filterable { @@ -126,7 +126,7 @@ export class ErvuChartV2 extends Control implements Filterable { super.initialize(); this.chartRpcService = this.getScript(ChartV2RpcService); this.filterDelegate = this.getScript(FilterDelegate); - this.plugins = this.getScripts('ervu-dashboard.component.chart.plugin.ChartPlugin'); + this.plugins = this.getScripts('ervu_business_metrics.component.chart.plugin.ChartPlugin'); } start(): void { diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts b/frontend/src/ts/ervu_business_metrics/component/chart/model/AxisGridSettings.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/model/AxisGridSettings.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts b/frontend/src/ts/ervu_business_metrics/component/chart/model/AxisSettings.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/model/AxisSettings.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts b/frontend/src/ts/ervu_business_metrics/component/chart/model/AxisTicksSettings.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/model/AxisTicksSettings.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts b/frontend/src/ts/ervu_business_metrics/component/chart/model/ChartBarSettings.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/model/ChartBarSettings.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/ChartLegendSettings.ts b/frontend/src/ts/ervu_business_metrics/component/chart/model/ChartLegendSettings.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/model/ChartLegendSettings.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/model/ChartLegendSettings.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/ArcBackgroundChartPlugin.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/ArcBackgroundChartPlugin.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/ArcBackgroundChartPlugin.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/ArcBackgroundChartPlugin.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/BarDataLabelChartPlugin.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/BarDataLabelChartPlugin.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/BarDataLabelChartPlugin.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/BarDataLabelChartPlugin.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/ChartPlugin.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/ChartPlugin.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/DoughnutCenterLabelsPlugin.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/DoughnutCenterLabelsPlugin.ts similarity index 97% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/DoughnutCenterLabelsPlugin.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/DoughnutCenterLabelsPlugin.ts index 2001177..e0a8247 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/plugin/DoughnutCenterLabelsPlugin.ts +++ b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/DoughnutCenterLabelsPlugin.ts @@ -2,7 +2,7 @@ import {ChartPlugin} from "./ChartPlugin"; import {Chart} from "chart.js"; import { ChartLabelModel -} from "../../../../generated/ervu_dashboard/model/chart/round/label/ChartLabelModel"; +} from "../../../../generated/ervu_business_metrics/model/chart/round/label/ChartLabelModel"; import {ChartUtils} from "../ChartUtils"; import {AnalyticalScope, Behavior, ChartFontFamily, Visible} from "@webbpm/base-package"; import {ErvuChartV2} from "../ErvuChartV2"; @@ -124,4 +124,4 @@ export class DoughnutCenterLabelsPlugin extends Behavior implements ChartPlugin .map((arc: any) => arc.innerRadius as number) .reduce((prev, curr) => Math.min(prev, curr), chart.width / 2); } -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/RoundArcCornersChartPlugin.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/RoundArcCornersChartPlugin.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/RoundArcCornersChartPlugin.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/RoundArcCornersChartPlugin.ts diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/ChartLabelFormatter.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/ChartLabelFormatter.ts similarity index 60% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/ChartLabelFormatter.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/ChartLabelFormatter.ts index f166027..2d42f3d 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/ChartLabelFormatter.ts +++ b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/ChartLabelFormatter.ts @@ -1,7 +1,7 @@ import { ChartLabelModel -} from "../../../../../generated/ervu_dashboard/model/chart/round/label/ChartLabelModel"; +} from "../../../../../generated/ervu_business_metrics/model/chart/round/label/ChartLabelModel"; export interface ChartLabelFormatter { format(label: ChartLabelModel, labels?: ChartLabelModel[], index?: number): void; -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts similarity index 95% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts index 7ff5f8a..653c4b0 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts +++ b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/formatters/UnitsLabelReplaceValueChartLabelFormatter.ts @@ -1,7 +1,7 @@ import {ChartLabelFormatter} from "./ChartLabelFormatter"; import { ChartLabelModel -} from "../../../../../generated/ervu_dashboard/model/chart/round/label/ChartLabelModel"; +} from "../../../../../generated/ervu_business_metrics/model/chart/round/label/ChartLabelModel"; import {NotNull, Visible} from "@webbpm/base-package"; import {FormatterUtils} from "../../../../formatter/FormatterUtils"; @@ -55,4 +55,4 @@ export class UnitsLabelReplaceValueChartLabelFormatter implements ChartLabelForm labelValueModel.text = result.label; } -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/model/ArcDatasetBackgroundConfig.ts b/frontend/src/ts/ervu_business_metrics/component/chart/plugin/model/ArcDatasetBackgroundConfig.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/chart/plugin/model/ArcDatasetBackgroundConfig.ts rename to frontend/src/ts/ervu_business_metrics/component/chart/plugin/model/ArcDatasetBackgroundConfig.ts diff --git a/frontend/src/ts/ervu-dashboard/component/filter/ComboboxFilterComponent.ts b/frontend/src/ts/ervu_business_metrics/component/filter/ComboboxFilterComponent.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/filter/ComboboxFilterComponent.ts rename to frontend/src/ts/ervu_business_metrics/component/filter/ComboboxFilterComponent.ts diff --git a/frontend/src/ts/ervu-dashboard/component/filter/FilterContainer.ts b/frontend/src/ts/ervu_business_metrics/component/filter/FilterContainer.ts similarity index 99% rename from frontend/src/ts/ervu-dashboard/component/filter/FilterContainer.ts rename to frontend/src/ts/ervu_business_metrics/component/filter/FilterContainer.ts index 4bade05..821e552 100644 --- a/frontend/src/ts/ervu-dashboard/component/filter/FilterContainer.ts +++ b/frontend/src/ts/ervu_business_metrics/component/filter/FilterContainer.ts @@ -21,7 +21,7 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from @Component({ moduleId: module.id, selector: 'filter-container', - templateUrl: './../../../../../src/resources/template/ervu-dashboard/FilterContainer.html', + templateUrl: './../../../../../src/resources/template/ervu_business_metrics/FilterContainer.html', changeDetection: ChangeDetectionStrategy.OnPush }) export class FilterContainer extends ValidatableContainer { @@ -159,4 +159,4 @@ export class FilterContainer extends ValidatableContainer { } return this.localStorageService.readTemporalWebbpmStorage(filterStorageKey); } -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/filter/FilterGroupDelegate.ts b/frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/component/filter/FilterGroupDelegate.ts rename to frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/FormatterUtils.ts b/frontend/src/ts/ervu_business_metrics/formatter/FormatterUtils.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/formatter/FormatterUtils.ts rename to frontend/src/ts/ervu_business_metrics/formatter/FormatterUtils.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts b/frontend/src/ts/ervu_business_metrics/formatter/ReplaceValueTextFormatter.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts rename to frontend/src/ts/ervu_business_metrics/formatter/ReplaceValueTextFormatter.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/UnitsLabelReplaceValueTextFormatter.ts b/frontend/src/ts/ervu_business_metrics/formatter/UnitsLabelReplaceValueTextFormatter.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/formatter/UnitsLabelReplaceValueTextFormatter.ts rename to frontend/src/ts/ervu_business_metrics/formatter/UnitsLabelReplaceValueTextFormatter.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts b/frontend/src/ts/ervu_business_metrics/formatter/model/ErvuReplaceValueModel.ts similarity index 100% rename from frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts rename to frontend/src/ts/ervu_business_metrics/formatter/model/ErvuReplaceValueModel.ts diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index c93c3e5..82611f9 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -18,8 +18,8 @@ import {RouterModule} from "@angular/router"; import {InternationalPhoneNumberModule} from "ngx-international-phone-number"; import {AppProgressIndicationComponent} from "./component/app-progress-indication.component"; 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 {ErvuChartV2} from "../../ervu_business_metrics/component/chart/ErvuChartV2"; +import {FilterContainer} from "../../ervu_business_metrics/component/filter/FilterContainer"; import {TokenInterceptor} from "./interceptor/token-interceptor.service"; import {DropdownTreeViewComponent} from "../../component/field/DropdownTreeViewComponent"; import {DropdownTreeviewSelectComponent} from "../../component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component"; diff --git a/frontend/src/ts/modules/mfe/provider/mfe-configuration.provider.ts b/frontend/src/ts/modules/mfe/provider/mfe-configuration.provider.ts index 511274a..a3075c4 100644 --- a/frontend/src/ts/modules/mfe/provider/mfe-configuration.provider.ts +++ b/frontend/src/ts/modules/mfe/provider/mfe-configuration.provider.ts @@ -1,7 +1,7 @@ export class MfeConfigurationProvider { private static config; // way to avoid webpack optimization public static MFE_BASE_URL = process.env.MFE_BASE_URL || ''; - public static BASE_COMPONENT_ATTRIBUTE = 'mfe-webbpm-dashboard'; + public static BASE_COMPONENT_ATTRIBUTE = 'mfe-webbpm-business-metrics'; public static getPageBaseUrl(): string { return this.config.PAGE_BASE_URL diff --git a/frontend/src/ts/modules/mfe/service/mfe-app-config.service.ts b/frontend/src/ts/modules/mfe/service/mfe-app-config.service.ts index 27ad22c..d089da1 100644 --- a/frontend/src/ts/modules/mfe/service/mfe-app-config.service.ts +++ b/frontend/src/ts/modules/mfe/service/mfe-app-config.service.ts @@ -21,8 +21,8 @@ export class MfeAppConfigService extends AppConfigService { this['mapParam'] = configData; }) .catch((error: any): any => { - console.error('Dashboard configuration file "app-config.json" could not be read'); + console.error('Business Metrics configuration file "app-config.json" could not be read'); return Promise.reject(error); }); } -} \ No newline at end of file +} diff --git a/frontend/src/ts/modules/mfe/service/mfe-app-version.service.ts b/frontend/src/ts/modules/mfe/service/mfe-app-version.service.ts index 3012790..ed0c556 100644 --- a/frontend/src/ts/modules/mfe/service/mfe-app-version.service.ts +++ b/frontend/src/ts/modules/mfe/service/mfe-app-version.service.ts @@ -19,11 +19,11 @@ export class MfeAppVersionService extends AppVersionService { .toPromise() .then(version => { this['appVersion'] = version; - console.log(`Dashboard application version = ${version}`); + console.log(`Business Metrics application version = ${version}`); }) .catch((error: any): any => { - console.error('Dashboard file "app.version" could not be read'); + console.error('Business Metrics file "app.version" could not be read'); return Promise.reject(error); }); } -} \ No newline at end of file +} diff --git a/pentaho_scripts/recruitment.ktr b/pentaho_scripts/recruitment.ktr index b190d8c..c7c5319 100644 --- a/pentaho_scripts/recruitment.ktr +++ b/pentaho_scripts/recruitment.ktr @@ -442,7 +442,7 @@ - ervu_dashboard + ervu_business_metrics 10.10.31.119 POSTGRESQL Native @@ -924,7 +924,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1047,7 +1047,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1170,7 +1170,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1293,7 +1293,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1416,7 +1416,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1539,7 +1539,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1662,7 +1662,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -1785,7 +1785,7 @@ none - ervu_dashboard + ervu_business_metrics 100 N @@ -2405,7 +2405,7 @@ postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2436,14 +2436,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2')), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '76e40191-adc7-4f03-84a4-0c29c44961a6' as recruitment_id, 1 as org, @@ -2481,7 +2481,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2512,14 +2512,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '794ed0fa-a25b-4858-b89e-815bb391f2b5' as recruitment_id, 1 as org, @@ -2557,7 +2557,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2588,14 +2588,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, 'd2e839ef-933c-48df-9a3a-ac1c00663154' as recruitment_id, 1 as org, @@ -2633,7 +2633,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2664,14 +2664,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '6b56f46a-16e7-4c0f-83a8-05fbddf2e6cb' as recruitment_id, 1 as org, @@ -2709,7 +2709,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2740,14 +2740,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2')), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '76e40191-adc7-4f03-84a4-0c29c44961a6' as recruitment_id, 1 as org, @@ -2785,7 +2785,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2816,14 +2816,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = '191e81ae-8f1d-495a-aee5-ec1f200ba509') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '794ed0fa-a25b-4858-b89e-815bb391f2b5' as recruitment_id, 1 as org, @@ -2861,7 +2861,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2892,14 +2892,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = '1284964b-3bf8-41b5-adb5-c6d1ec1bc13c') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, 'd2e839ef-933c-48df-9a3a-ac1c00663154' as recruitment_id, 1 as org, @@ -2937,7 +2937,7 @@ from t1 full outer join t2 on 1 = 1 full outer join t3 on 1 = 1 full outer join postgres.subpoena - with + with t1 as (select count(distinct subpoena.id) as subpoena FROM subpoena JOIN subpoena_history ON subpoena_history.subpoena_id = subpoena.id JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id @@ -2968,14 +2968,14 @@ JOIN subpoena_status AS sub_status ON sub_status.id = subpoena.status_id JOIN subpoena_status AS sub_stat_hist ON sub_stat_hist.id = subpoena_history.status_id JOIN subpoena_reason ON subpoena_reason.id = subpoena.reason_id where not subpoena_reason.type='3' and sub_stat_hist.code in ('3.8','5.2') and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e'), -t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t6 as (select count(distinct rdi.id) as restrictions_applied from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and subpoena_reason.type = '3' and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e'), -t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi -join restriction_document on restriction_document.id = rdi.restriction_document_create_id -join subpoena on subpoena.id = restriction_document.subpoena_id +t7 as (select count(distinct rdi.id) as introduced_measures from restriction_document_item rdi +join restriction_document on restriction_document.id = rdi.restriction_document_create_id +join subpoena on subpoena.id = restriction_document.subpoena_id join subpoena_reason on subpoena_reason.id = subpoena.reason_id where rdi.restriction_document_cancel_id is null and rdi.applied_date is not null and subpoena_reason.type = '3' and subpoena.department_id = 'de265e31-4b82-4dc8-9bf6-af990d6d649e') select t1.subpoena, t2.appeared, t3.not_appeared, t4.not_ap_good_reason, t5.ap_not_required, t6.restrictions_applied, t7.introduced_measures, 1 as mil_reg, '6b56f46a-16e7-4c0f-83a8-05fbddf2e6cb' as recruitment_id, 1 as org, diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page index aa8c31e..335ed90 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page @@ -164,7 +164,7 @@ ComboboxFilterComponent - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true true @@ -12347,7 +12347,7 @@ RoundSingleChartDataSetService -ervu_dashboard.component.chart +ervu_business_metrics.component.chart @@ -12359,7 +12359,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -12404,7 +12404,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -12412,7 +12412,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -12452,7 +12452,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -12464,7 +12464,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -12473,7 +12473,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -13441,7 +13441,7 @@ RoundSingleChartDataSetService -ervu_dashboard.component.chart +ervu_business_metrics.component.chart @@ -13453,7 +13453,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -13492,7 +13492,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -13500,7 +13500,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -13540,7 +13540,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -13551,7 +13551,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -13560,7 +13560,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -14379,7 +14379,7 @@ RoundSingleChartDataSetService -ervu_dashboard.component.chart +ervu_business_metrics.component.chart @@ -14391,7 +14391,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -14430,7 +14430,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -14438,7 +14438,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -14478,7 +14478,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -14489,7 +14489,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -14498,7 +14498,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -15577,7 +15577,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true @@ -16962,7 +16962,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -18806,7 +18806,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -18815,7 +18815,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -18837,7 +18837,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -18874,7 +18874,7 @@ StaticFilterReference -ervu_dashboard.component.filter +ervu_business_metrics.component.filter @@ -18885,7 +18885,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -19025,7 +19025,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -19833,7 +19833,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -21163,7 +21163,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -22690,7 +22690,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -23674,7 +23674,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -24590,7 +24590,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -25940,7 +25940,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -26401,7 +26401,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -26413,7 +26413,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -26452,7 +26452,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -26460,7 +26460,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -26500,7 +26500,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -26511,7 +26511,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -26520,7 +26520,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -27264,7 +27264,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -27273,7 +27273,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -27295,7 +27295,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -27332,7 +27332,7 @@ StaticFilterReference -ervu_dashboard.component.filter +ervu_business_metrics.component.filter @@ -27343,7 +27343,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -27483,7 +27483,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -27790,7 +27790,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -27802,7 +27802,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -27847,7 +27847,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -27855,7 +27855,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -27895,7 +27895,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -27906,7 +27906,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -27915,7 +27915,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -29423,7 +29423,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -29884,7 +29884,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -29896,7 +29896,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -29935,7 +29935,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -29943,7 +29943,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -29983,7 +29983,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -29994,7 +29994,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -30003,7 +30003,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -31660,7 +31660,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -31672,7 +31672,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -31717,7 +31717,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -31725,7 +31725,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -31765,7 +31765,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -31776,7 +31776,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -31785,7 +31785,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -33291,7 +33291,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -33759,7 +33759,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -33768,7 +33768,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -33790,7 +33790,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -33827,7 +33827,7 @@ StaticFilterReference -ervu_dashboard.component.filter +ervu_business_metrics.component.filter @@ -33838,7 +33838,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -33978,7 +33978,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -35316,7 +35316,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -36300,7 +36300,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -37216,7 +37216,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -38566,7 +38566,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -39027,7 +39027,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -39039,7 +39039,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -39078,7 +39078,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -39086,7 +39086,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -39126,7 +39126,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -39137,7 +39137,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -39146,7 +39146,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -39890,7 +39890,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -39899,7 +39899,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -39921,7 +39921,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -39958,7 +39958,7 @@ StaticFilterReference -ervu_dashboard.component.filter +ervu_business_metrics.component.filter @@ -39969,7 +39969,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -40109,7 +40109,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -40416,7 +40416,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -40428,7 +40428,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -40473,7 +40473,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -40481,7 +40481,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -40521,7 +40521,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -40532,7 +40532,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -40541,7 +40541,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -42049,7 +42049,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -42510,7 +42510,7 @@ RoundSingleChartDataSetService - ervu_dashboard.component.chart + ervu_business_metrics.component.chart @@ -42522,7 +42522,7 @@ ErvuChartV2 - ervu-dashboard.component.chart + ervu_business_metrics.component.chart true true @@ -42561,7 +42561,7 @@ RoundArcCornersChartPlugin - ervu-dashboard.component.chart.plugin + ervu_business_metrics.component.chart.plugin true true @@ -42569,7 +42569,7 @@ FilterReferences - ervu_dashboard.component.filter + ervu_business_metrics.component.filter true @@ -42609,7 +42609,7 @@ StaticFilterReference - ervu_dashboard.component.filter + ervu_business_metrics.component.filter @@ -42620,7 +42620,7 @@ FilterGroupDelegate - ervu-dashboard.component.filter + ervu_business_metrics.component.filter true @@ -42629,7 +42629,7 @@ - {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + {"objectId":"32c1ef3d-c802-4fff-99f4-f6a59c6902aa","packageName":"ervu_business_metrics.component.filter","className":"ComboboxFilterComponent","type":"TS"} diff --git a/resources/src/main/resources/database/datasource.xml b/resources/src/main/resources/database/datasource.xml index b2fc3ea..dcd8eb0 100644 --- a/resources/src/main/resources/database/datasource.xml +++ b/resources/src/main/resources/database/datasource.xml @@ -1,6 +1,6 @@ - ervu_dashboard.ervu_dashboard.db_beans + ru.micord.webbpm.ervu.business_metrics.db_beans ervu_bm_empty org.postgresql.Driver 10.10.31.119