diff --git a/backend/src/main/java/custom/grid/formatter/YearFormatter.java b/backend/src/main/java/custom/grid/formatter/YearFormatter.java new file mode 100644 index 00000000..0db0c197 --- /dev/null +++ b/backend/src/main/java/custom/grid/formatter/YearFormatter.java @@ -0,0 +1,22 @@ +package custom.grid.formatter; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Objects; + +import property.grid.Formatter; + +/** + * @author r.latypov + */ +public class YearFormatter implements Formatter { + + @Override + public String format(final Object object) { + return object == null + ? null + : object instanceof Date date + ? new SimpleDateFormat("yyyy").format(date) + : Objects.toString(object); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java b/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java index d99c114c..80376d0d 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/ErvuMultiChartDataSetService.java @@ -128,6 +128,18 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im chartDataSetDto.setyAxisID(aggFuncData.yAxesId); chartDataSetDto.setTension(aggFuncData.tension); chartDataSetDto.setOrder(aggFuncData.drawOrder); + chartDataSetDto.setStack(aggFuncData.stack); + + chartDataSetDto.setBorderRadius(aggFuncData.borderRadius); + chartDataSetDto.setBorderWidth(aggFuncData.borderWidth); + chartDataSetDto.setBarPercentage(aggFuncData.barPercentage); + chartDataSetDto.setBarThickness(aggFuncData.barThickness); + chartDataSetDto.setCategoryPercentage(aggFuncData.categoryPercentage); + chartDataSetDto.setBorderDash(aggFuncData.borderDash); + chartDataSetDto.setBorderDashOffset(aggFuncData.borderDashOffset); + chartDataSetDto.setPointBorderWidth(aggFuncData.pointBorderWidth); + chartDataSetDto.setPointRadius(aggFuncData.pointRadius); + return chartDataSetDto; }).collect(Collectors.toList())).flatMap(Collection::stream).collect(Collectors.toList()); } @@ -165,6 +177,18 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im chartDataSetDto.setyAxisID(staticChartData.yAxesId); chartDataSetDto.setTension(staticChartData.tension); chartDataSetDto.setOrder(staticChartData.drawOrder); + chartDataSetDto.setStack(staticChartData.stack); + + chartDataSetDto.setBorderRadius(staticChartData.borderRadius); + chartDataSetDto.setBorderWidth(staticChartData.borderWidth); + chartDataSetDto.setBarPercentage(staticChartData.barPercentage); + chartDataSetDto.setBarThickness(staticChartData.barThickness); + chartDataSetDto.setCategoryPercentage(staticChartData.categoryPercentage); + chartDataSetDto.setBorderDash(staticChartData.borderDash); + chartDataSetDto.setBorderDashOffset(staticChartData.borderDashOffset); + chartDataSetDto.setPointBorderWidth(staticChartData.pointBorderWidth); + chartDataSetDto.setPointRadius(staticChartData.pointRadius); + return chartDataSetDto; }).collect(Collectors.toList()); } @@ -205,6 +229,7 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im chartDataSetDto.setyAxisID(dataSet.yAxesId); chartDataSetDto.setTension(dataSet.tension); chartDataSetDto.setOrder(dataSet.drawOrder); + chartDataSetDto.setStack(dataSet.stack); chartDataSetDto.setBorderRadius(dataSet.borderRadius); chartDataSetDto.setBarPercentage(dataSet.barPercentage); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ColumnAggregationDataSet.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ColumnAggregationDataSet.java index 9526ed7f..a1f9635f 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ColumnAggregationDataSet.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ColumnAggregationDataSet.java @@ -30,7 +30,9 @@ public class ColumnAggregationDataSet { public String yAxesId; - public Float tension; + public String tension; public Integer drawOrder; + + public String stack; } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ErvuChartDataSetDto.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ErvuChartDataSetDto.java index eeb590d7..eb26e626 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ErvuChartDataSetDto.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/ErvuChartDataSetDto.java @@ -10,36 +10,12 @@ import component.chart.dto.ChartPointDto; */ public class ErvuChartDataSetDto extends ChartDataSetDto { - public Integer borderRadius; - public String barPercentage; - public String[] backgroundColors; - public ErvuChartDataSetDto(String label, String type, - List data) { + public ErvuChartDataSetDto(String label, String type, List data) { super(label, type, data); } - public Integer getBorderRadius() { - return borderRadius; - } - - public void setBorderRadius(Integer borderRadius) { - this.borderRadius = borderRadius; - } - - public String getBarPercentage() { - return barPercentage; - } - - public void setBarPercentage(String barPercentage) { - this.barPercentage = barPercentage; - } - - public String[] getBackgroundColors() { - return backgroundColors; - } - public void setBackgroundColors(String[] backgroundColors) { this.backgroundColors = backgroundColors; } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java index 5a475948..9d8307ef 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java @@ -21,13 +21,4 @@ public class RoundChartDataDto extends SingleChartDataDto { super(datasets, labels); this.centerLabels = centerLabels; } - - public List getCenterLabels() { - return centerLabels; - } - - public void setCenterLabels( - List centerLabels) { - this.centerLabels = centerLabels; - } } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java index 531b3c6d..aea42dbd 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDto.java @@ -18,10 +18,6 @@ public class RoundChartDataSetDto extends SingleChartDataSetDto { @JsonInclude public Integer hoverOffset; - public RoundChartDataSetDto() { - super(null, null, null); - } - public RoundChartDataSetDto(String label, List data, String[] backgroundColor, Integer borderWidth, String radius, String cutout, Integer hoverOffset) { super(label, data, backgroundColor); @@ -30,36 +26,4 @@ public class RoundChartDataSetDto extends SingleChartDataSetDto { this.cutout = cutout; this.hoverOffset = hoverOffset; } - - public String getRadius() { - return radius; - } - - public void setRadius(String radius) { - this.radius = radius; - } - - public String getCutout() { - return cutout; - } - - public void setCutout(String cutout) { - this.cutout = cutout; - } - - public Integer getBorderWidth() { - return borderWidth; - } - - public void setBorderWidth(Integer borderWidth) { - this.borderWidth = borderWidth; - } - - public Integer getHoverOffset() { - return hoverOffset; - } - - public void setHoverOffset(Integer hoverOffset) { - this.hoverOffset = hoverOffset; - } } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java index a17821c1..ce875e89 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataSetDtoWrapper.java @@ -6,8 +6,8 @@ import java.util.List; * @author Vitaly Chekushkin */ public class RoundChartDataSetDtoWrapper { - private RoundChartDataSetDto roundChartDataSetDto; - private List labels; + private final RoundChartDataSetDto roundChartDataSetDto; + private final List labels; public RoundChartDataSetDtoWrapper(RoundChartDataSetDto roundChartDataSetDto, List labels) { @@ -19,15 +19,7 @@ public class RoundChartDataSetDtoWrapper { return roundChartDataSetDto; } - public void setRoundChartDataSetDto(RoundChartDataSetDto roundChartDataSetDto) { - this.roundChartDataSetDto = roundChartDataSetDto; - } - public List getLabels() { return labels; } - - public void setLabels(List labels) { - this.labels = labels; - } } diff --git a/backend/src/main/resources/config/v_1.9.2/20250205-ERVU-271.xml b/backend/src/main/resources/config/v_1.9.2/20250205-ERVU-271.xml new file mode 100644 index 00000000..15e915cf --- /dev/null +++ b/backend/src/main/resources/config/v_1.9.2/20250205-ERVU-271.xml @@ -0,0 +1,39 @@ + + + + + create schema + + CREATE SCHEMA IF NOT EXISTS forecast; + ALTER SCHEMA forecast OWNER TO "ervu-dashboard"; + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.registered_citizens ( + registered_citizens_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + count_all numeric NULL, + reaching_17_age numeric NULL, + women_military_specialty numeric NULL, + CONSTRAINT pk_registered_citizens PRIMARY KEY (registered_citizens_id) + ); + + ALTER TABLE IF EXISTS forecast.registered_citizens OWNER TO "ervu-dashboard"; + + + COMMENT ON TABLE forecast.registered_citizens IS 'Динамика количества граждан на учете'; + COMMENT ON COLUMN forecast.registered_citizens.count_all IS 'Всего на учете'; + COMMENT ON COLUMN forecast.registered_citizens.reaching_17_age IS 'В год достижения 17 лет'; + COMMENT ON COLUMN forecast.registered_citizens.women_military_specialty IS 'Женщины, получившие ВУС'; + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.9.2/20250212-ERVU-271.xml b/backend/src/main/resources/config/v_1.9.2/20250212-ERVU-271.xml new file mode 100644 index 00000000..7979a345 --- /dev/null +++ b/backend/src/main/resources/config/v_1.9.2/20250212-ERVU-271.xml @@ -0,0 +1,153 @@ + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.reporting_military_commissariat ( + reporting_military_commissariat_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + subpoenaed_appear numeric NULL, + missed_deadline numeric NULL, + missed_deadline_reason numeric NULL, + subpoenas_issued numeric NULL, + retrieved_7_days numeric NULL, + CONSTRAINT pk_reporting_military_commissariat PRIMARY KEY (reporting_military_commissariat_id) + ); + + ALTER TABLE IF EXISTS forecast.reporting_military_commissariat OWNER TO "ervu-dashboard"; + + COMMENT ON TABLE forecast.reporting_military_commissariat IS 'Явка в Военный комиссариат'; + + COMMENT ON COLUMN forecast.reporting_military_commissariat.subpoenaed_appear IS 'Явились по повесткам'; + COMMENT ON COLUMN forecast.reporting_military_commissariat.missed_deadline IS 'Не явились в срок'; + COMMENT ON COLUMN forecast.reporting_military_commissariat.missed_deadline_reason IS 'Не явились по уважительной причине'; + COMMENT ON COLUMN forecast.reporting_military_commissariat.subpoenas_issued IS 'Вручено повесток'; + COMMENT ON COLUMN forecast.reporting_military_commissariat.retrieved_7_days IS 'Вручено через 7 дней(автоматически)'; + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.enroll ( + enroll_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + study numeric NULL, + work numeric NULL, + unemployed numeric NULL, + count_17_years numeric NULL, + count_18_26_years numeric NULL, + count_27_30_years numeric NULL, + count_31_35_years numeric NULL, + count_36_40_years numeric NULL, + count_41_45_years numeric NULL, + count_46_50_years numeric NULL, + count_51_years numeric NULL, + CONSTRAINT pk_enroll PRIMARY KEY (enroll_id) + ); + + ALTER TABLE IF EXISTS forecast.enroll OWNER TO "ervu-dashboard"; + + COMMENT ON TABLE forecast.enroll IS 'Подлежат постановке на учет'; + + COMMENT ON COLUMN forecast.enroll.study IS 'Учатся'; + COMMENT ON COLUMN forecast.enroll.work IS 'Работают'; + COMMENT ON COLUMN forecast.enroll.unemployed IS 'Безработные'; + COMMENT ON COLUMN forecast.enroll.count_17_years IS '17 л.'; + COMMENT ON COLUMN forecast.enroll.count_18_26_years IS '18-26 л.'; + COMMENT ON COLUMN forecast.enroll.count_27_30_years IS '27-30 л.'; + COMMENT ON COLUMN forecast.enroll.count_31_35_years IS '31-35 л.'; + COMMENT ON COLUMN forecast.enroll.count_36_40_years IS '36-40 л.'; + COMMENT ON COLUMN forecast.enroll.count_41_45_years IS '41-45 л.'; + COMMENT ON COLUMN forecast.enroll.count_46_50_years IS '46-50 л.'; + COMMENT ON COLUMN forecast.enroll.count_51_years IS '51+ л.'; + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.temporary_measures ( + temporary_measures_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + introduction_provisional_measures numeric NULL, + lifting_provisional_measures numeric NULL, + CONSTRAINT pk_temporary_measures PRIMARY KEY (temporary_measures_id) + ); + + ALTER TABLE IF EXISTS forecast.temporary_measures OWNER TO "ervu-dashboard"; + + COMMENT ON TABLE forecast.temporary_measures IS 'Решения о принятии и снятии временных мер'; + + COMMENT ON COLUMN forecast.temporary_measures.introduction_provisional_measures IS 'Введение временных мер'; + COMMENT ON COLUMN forecast.temporary_measures.lifting_provisional_measures IS 'Снятие временных мер'; + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.appeals ( + appeals_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + resolved_appeals numeric NULL, + document_retrieval numeric NULL, + retraction_complaint numeric NULL, + disagreement_decision numeric NULL, + incorrect_information numeric NULL, + maintaining_military_records numeric NULL, + conscription numeric NULL, + temporary_measures numeric NULL, + CONSTRAINT pk_appeals PRIMARY KEY (appeals_id) + ); + + ALTER TABLE IF EXISTS forecast.appeals OWNER TO "ervu-dashboard"; + + COMMENT ON TABLE forecast.appeals IS 'Обжалования'; + + COMMENT ON COLUMN forecast.appeals.resolved_appeals IS 'Решенные обжалования'; + COMMENT ON COLUMN forecast.appeals.document_retrieval IS 'Досыл документов'; + COMMENT ON COLUMN forecast.appeals.retraction_complaint IS 'Отзыв жалобы'; + COMMENT ON COLUMN forecast.appeals.disagreement_decision IS 'Несогласие с решением'; + COMMENT ON COLUMN forecast.appeals.incorrect_information IS 'Некорректные данные'; + COMMENT ON COLUMN forecast.appeals.maintaining_military_records IS 'Ведение воинского учета'; + COMMENT ON COLUMN forecast.appeals.conscription IS 'Призыв на службу'; + COMMENT ON COLUMN forecast.appeals.temporary_measures IS 'Временные меры'; + + + + + create table + + CREATE TABLE IF NOT EXISTS forecast.deferment_conscription ( + deferment_conscription_id bigserial NOT NULL, + recruitment_id uuid NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "schema" varchar(64) DEFAULT 'empty'::character varying NOT NULL, + eligible_deferment numeric NULL, + deferment_granted numeric NULL, + CONSTRAINT pk_deferment_conscription PRIMARY KEY (deferment_conscription_id) + ); + + ALTER TABLE IF EXISTS forecast.deferment_conscription OWNER TO "ervu-dashboard"; + + COMMENT ON TABLE forecast.deferment_conscription IS 'Отсрочка от призыва'; + + COMMENT ON COLUMN forecast.deferment_conscription.eligible_deferment IS 'Имеют право на отсрочку'; + COMMENT ON COLUMN forecast.deferment_conscription.deferment_granted IS 'Предоставлена отсрочка'; + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.9.2/changelog-1.9.2.xml b/backend/src/main/resources/config/v_1.9.2/changelog-1.9.2.xml index 07cf9fdf..bdb24d9f 100644 --- a/backend/src/main/resources/config/v_1.9.2/changelog-1.9.2.xml +++ b/backend/src/main/resources/config/v_1.9.2/changelog-1.9.2.xml @@ -13,5 +13,7 @@ - + + + diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8da8a03e..f77a3cbe 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1748,9 +1748,9 @@ } }, "@webbpm/base-package": { - "version": "3.185.0", - "resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.185.0.tgz", - "integrity": "sha512-m6qlhhYIjx6tNUJl5MNsUflAFjLt2tLurxf706iwI6IM8ZZGeTjF6j1dCeEUZnOc6hntdRigcUpOsSGa97QMog==", + "version": "3.185.1", + "resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.185.1.tgz", + "integrity": "sha512-RiULNC8FWC6ynVvxHFo0qFwcUw226bBJXwQMz6680brBkgw5YfMDU4jhyb1GCAK3HQSDoZWV3ZSJBU04NjXnZg==", "requires": { "tslib": "^1.9.0" } diff --git a/frontend/package.json b/frontend/package.json index 073474b4..2e286891 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,7 +26,7 @@ "@angular/platform-browser-dynamic": "7.2.15", "@angular/router": "7.2.15", "@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1", - "@webbpm/base-package": "3.185.0", + "@webbpm/base-package": "3.185.1", "ag-grid-angular": "29.0.0-micord.4", "ag-grid-community": "29.0.0-micord.4", "angular-calendar": "0.28.28", diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 8312a1d6..6b714b67 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -458,6 +458,9 @@ .webbpm.ervu_dashboard text label { width: min(7.5vw, 9.375rem) ; /*150px*/ } +.webbpm.ervu_dashboard .free-label label { + width: auto; +} .webbpm.ervu_dashboard text.num-addtitle > div > div:first-child { color: var(--color-text-secondary); align-items: center; @@ -468,6 +471,42 @@ line-height: normal; } +.webbpm.ervu_dashboard .selectize-control { + height: 100%; + background-color: transparent; +} +.webbpm.ervu_dashboard .selectize-control .selectize-input, +.webbpm.ervu_dashboard input, +.webbpm.ervu_dashboard input[disabled] { + color: var(--color-text-primary); + font-size: var(--size-text-primary); + min-height: max-content; + padding: var(--indent-small) var(--indent-xlarge) var(--indent-small) var(--indent-medium); + margin-bottom: 0; + border-radius: 100px; + border: 0; + background-color: var(--color-dark-20); +} +.webbpm.ervu_dashboard .selectize-control .selectize-input { + display: flex; +} +.webbpm.ervu_dashboard .selectize-control .selectize-input::after { + position: absolute; + content: "\f282"; + position: absolute; + 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-base); + height: auto; + width: auto; + border: 0; +} +.webbpm.ervu_dashboard .selectize-control .selectize-input::before { + display: none; +} + .webbpm.ervu_dashboard .selectize-dropdown { height: fit-content; padding: var(--indent-base) 0; @@ -827,7 +866,8 @@ .webbpm.ervu_dashboard [class*="graph-legend"] ervu-chart-v2 ~ hbox { margin-top: var(--indent-mini); } -.webbpm.ervu_dashboard [class*="graph-legend"] > div > hbox { +.webbpm.ervu_dashboard [class*="graph-legend"] > div > hbox, +.webbpm.ervu_dashboard [class*="graph-legend"] > div > text[class*="col-"] ~ text { margin-top: var(--indent-mini); } .webbpm.ervu_dashboard [class*="graph-legend"] .form-group { @@ -927,6 +967,28 @@ background-color: #7e6ad9; } +.webbpm.ervu_dashboard [class*="graph-legend"] [class*="col-"] label { + font-family: 'GilroyEB'; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-red label { + color: #e24040; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-lila label { + color: #d04eff; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-yellow label { + color: #ffc737; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-blue label { + color: #00f0ff; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-orange label { + color: #d98200; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .col-green label { + color: #00db5b; +} + .webbpm.ervu_dashboard .pers-group .vertical-container > text:first-child { color: var(--color-text-secondary); } @@ -1160,39 +1222,7 @@ background: var(--btn-bg); box-shadow: var(--btn-shadow); } -.webbpm.ervu_dashboard .search-block .selectize-control { - height: 100%; - background-color: transparent; -} -.webbpm.ervu_dashboard .search-block :is(.selectize-input, input) { - color: var(--color-text-primary); - font-size: var(--size-text-primary); - min-height: max-content; - padding: var(--indent-small) var(--indent-xlarge) var(--indent-small) var(--indent-medium); - margin-bottom: 0; - border-radius: 100px; - border: 0; - background-color: var(--color-dark-20); -} -.webbpm.ervu_dashboard .search-block .selectize-input { - display: flex; -} -.webbpm.ervu_dashboard .search-block .selectize-input::after { - position: absolute; - content: "\f282"; - position: absolute; - 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-base); - height: auto; - width: auto; - border: 0; -} -.webbpm.ervu_dashboard .search-block .selectize-input::before { - display: none; -} + .webbpm.ervu_dashboard .search-block .grid { flex-direction: column; flex: 1 1 auto; diff --git a/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts b/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts index 16deca11..34527653 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts @@ -35,4 +35,66 @@ export class ChartUtils { public static clone(source: T): T { return JSON.parse(JSON.stringify(source)); } -} \ No newline at end of file + + public static hexToHsl(colorHex: string, lightness?: number): string { + if (!colorHex) { + return colorHex; + } + let result: string[] = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(colorHex); + if (!result) { + result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(colorHex); + } + if (!result || (result.length != 4 && result.length != 5)) { + return undefined; + } + + let r = parseInt(result[1], 16); + let g = parseInt(result[2], 16); + let b = parseInt(result[3], 16); + r /= 255; + g /= 255; + b /= 255; + + const max = Math.max(r, g, b), min = Math.min(r, g, b); + let h, s, l = (max + min) / 2; + + if (max == min) { + h = s = 0; // achromatic + } + else { + const d = max - min; + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + switch (max) { + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; + break; + } + h /= 6; + } + + h = Math.round(h * 360); + s = Math.round(s * 100); + l = Math.round(l * 100); + + if (lightness) { + l *= lightness / 100; + l = Math.round(Math.max(0, Math.min(100, l))); + } + + let a: number; + if (result.length == 5) { + a = parseInt(result[4], 16) + a = Math.round(a / 255 * 10) / 10; + } + + return result.length == 5 + ? 'hsla(' + h + ', ' + s + '%, ' + l + '%, ' + a + ')' + : 'hsl(' + h + ', ' + s + '%, ' + l + '%)'; + } +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts b/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts index 246af4d3..21977c7d 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts @@ -25,8 +25,9 @@ import { UnsupportedOperationError, Visible } from "@webbpm/base-package"; -import {ChartLegendSettings} from "./model/ChartLegendSettings"; import {ChartBarSettings} from "./model/ChartBarSettings"; +import {ChartLegendSettings} from "./model/ChartLegendSettings"; +import {Options} from "./model/Options"; import {ChartPlugin} from "./plugin/ChartPlugin"; import {ChartUtils} from "./ChartUtils"; @@ -52,6 +53,7 @@ export class ErvuChartV2 extends Control implements Filterable { public scales: ChartScaleSettings[]; public bars: ChartBarSettings; + public options: Options; @NotNull() public loadOnStart: boolean = true; @@ -223,14 +225,19 @@ export class ErvuChartV2 extends Control implements Filterable { chartOptions.plugins.title = this.title; } - if (this.addDataSetsVisibilityToggleDataset && chartConfig.data.datasets && - chartConfig.data.datasets.length > 0) { - let datasetLength = chartConfig.data.datasets.length; - chartConfig.data.datasets.push({ - label: this.hideAllDatasetsLabel, - xAxisID: {display: false}, - yAxisID: {display: false} - }); + let datasets; + let datasetsLength: number = 0; + if (chartConfig.data && chartConfig.data.datasets && chartConfig.data.datasets.length > 0) { + datasets = chartConfig.data.datasets; + datasetsLength = datasets.length; + } + + if (this.addDataSetsVisibilityToggleDataset && datasetsLength > 0) { + datasets.push({ + label: this.hideAllDatasetsLabel, + xAxisID: {display: false}, + yAxisID: {display: false} + }); chartOptions.plugins.legend.onClick = (e, legendItem, legend) => { const index = legendItem.datasetIndex; @@ -238,12 +245,12 @@ export class ErvuChartV2 extends Control implements Filterable { let datasetMeta = chartObj.getDatasetMeta(index); - if (datasetLength == index) { + if (datasetsLength == index) { let showAll = datasetMeta.label == this.showAllDatasetsLabel; chartObj.data.datasets[index].label = showAll ? this.hideAllDatasetsLabel : this.showAllDatasetsLabel; - for (let i = 0; i < datasetLength; i++) { + for (let i = 0; i < datasetsLength; i++) { chartObj.setDatasetVisibility(i, showAll); } chartObj.update(); @@ -261,8 +268,8 @@ export class ErvuChartV2 extends Control implements Filterable { }; } - if (chartConfig.data.datasets) { // remove it after change type of ChartDataSetDto.backgroundColor - chartConfig.data.datasets.forEach(dataset => { + if (datasetsLength > 0) { // remove it after change type of ChartDataSetDto.backgroundColor + datasets.forEach(dataset => { if (dataset.backgroundColors) dataset.backgroundColor = dataset.backgroundColors; }); } @@ -282,7 +289,16 @@ export class ErvuChartV2 extends Control implements Filterable { if (this.bars) { chartOptions.scales = chartOptions.scales ? chartOptions.scales : {}; chartOptions.scales.x = this.bars.x; - chartOptions.scales.y = this.bars.y + chartOptions.scales.y = this.bars.y; + + // shadow bar treatment + if (this.bars.shadowBar && datasetsLength > 0) { + this.initShadowBar(datasets); + } + } + + if (this.options) { + Object.assign(chartOptions, this.options); } chartConfig.tooltips = { @@ -304,6 +320,42 @@ export class ErvuChartV2 extends Control implements Filterable { this.chartConfig = chartConfig; } + private initShadowBar(datasets) { + const shadowBarStack: string = this.bars.shadowBar; + const shadowBarIndex = datasets.findIndex(element => element.stack === shadowBarStack); + + if (shadowBarIndex > -1) { + const shadowBar = datasets[shadowBarIndex]; + + const stacks: string[] = []; + datasets.forEach((element, index) => { + let stack: string = element.stack; + if (stack) { + if (stack !== shadowBarStack && !stacks.includes(stack)) { + stacks.push(stack); + } + } + else { + stack = shadowBarStack + index; + element.stack = stack; + stacks.push(stack); + } + }); + + datasets.splice(shadowBarIndex, 1); + + stacks.forEach(value => { + const cloneShadowBar = {...shadowBar}; + cloneShadowBar.data = []; + shadowBar.data.forEach((item) => { + cloneShadowBar.data.push({...item}); + }); + cloneShadowBar.stack = value; + datasets.push(cloneShadowBar); + }); + } + } + private repaint(chartData) { if (this.chart) { this.chart.destroy(); diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts index 48b72583..fd980b2f 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisGridSettings.ts @@ -1,4 +1,13 @@ +import {AdvancedProperty, ColorEditor} from "@webbpm/base-package"; + export class AxisGridSettings { - public display: boolean = true; - public drawBorder: boolean = true; -} \ No newline at end of file + public display: boolean; + @AdvancedProperty() + public drawBorder: boolean; + @AdvancedProperty() + @ColorEditor() + public borderColor: string; + @AdvancedProperty() + @ColorEditor() + public color: string; +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts index 86a3937e..e6302495 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisSettings.ts @@ -1,8 +1,11 @@ import {AxisGridSettings} from "./AxisGridSettings"; import {AxisTicksSettings} from "./AxisTicksSettings"; +import {AdvancedProperty} from "@webbpm/base-package"; export class AxisSettings { + public stacked: boolean; public grid: AxisGridSettings; public ticks: AxisTicksSettings; + @AdvancedProperty() public grace: string; -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts index cd5e97ad..1cc0d7f0 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/model/AxisTicksSettings.ts @@ -1,3 +1,8 @@ +import {AdvancedProperty, ColorEditor} from "@webbpm/base-package"; + export class AxisTicksSettings { - public display: boolean = true; -} \ No newline at end of file + public display: boolean; + @AdvancedProperty() + @ColorEditor() + public color: string; +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts b/frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts index dc9dc383..b8a7080f 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts @@ -1,6 +1,7 @@ import {AxisSettings} from "./AxisSettings"; export class ChartBarSettings { + public shadowBar: string; public x: AxisSettings; public y: AxisSettings; -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/model/Options.ts b/frontend/src/ts/ervu-dashboard/component/chart/model/Options.ts new file mode 100644 index 00000000..432667ee --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/component/chart/model/Options.ts @@ -0,0 +1,16 @@ +export class Options { + // bar, doughnut + public borderRadius: number; + // bar, line + public borderWidth: number; + // bar + public barPercentage: number; + public barThickness: number; + public categoryPercentage: number; + // line + public borderDash: number[]; + public borderDashOffset: number; + public pointBorderWidth: number; + public pointRadius: number; + public tension: number; +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/BackgroundColorChartPlugin.ts b/frontend/src/ts/ervu-dashboard/component/chart/plugin/BackgroundColorChartPlugin.ts new file mode 100644 index 00000000..69527a7a --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/component/chart/plugin/BackgroundColorChartPlugin.ts @@ -0,0 +1,38 @@ +import { + AdvancedProperty, + AnalyticalScope, + Behavior, + ColorEditor, + Visible +} from "@webbpm/base-package"; +import {Chart} from "chart.js"; +import {ChartPlugin} from "./ChartPlugin"; +import {ErvuChartV2} from "../ErvuChartV2"; + +@AnalyticalScope(ErvuChartV2) +export class BackgroundColorChartPlugin extends Behavior implements ChartPlugin { + @Visible('false') + id: string = 'background-color'; + @ColorEditor() + public color: string; + @AdvancedProperty() + public onlyChartArea: boolean; + + /** + * Настройка цвета фона + */ + beforeDraw(chart: Chart): void { + const {ctx, chartArea: {left, top, width, height}} = chart; + ctx.save(); + ctx.globalCompositeOperation = 'destination-over'; + ctx.fillStyle = this.color ? this.color : 'lightGreen'; + + if (this.onlyChartArea) { + ctx.fillRect(left, top, width, height); + } + else { + ctx.fillRect(0, 0, chart.width, chart.height); + } + ctx.restore(); + } +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts b/frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts index 18f35cbc..c008b42c 100644 --- a/frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts +++ b/frontend/src/ts/ervu-dashboard/component/chart/plugin/ChartPlugin.ts @@ -3,6 +3,10 @@ import {Chart, ChartMeta} from "chart.js"; export interface ChartPlugin { id: string; + beforeUpdate?(chart: Chart, args?, options?): void; + beforeElementsUpdate?(chart: Chart, args?, options?): void; + beforeDatasetsUpdate?(chart: Chart, args?, options?): void; + beforeDraw?(chart: Chart): void; beforeDatasetsDraw?(chart: Chart, args?: { cancellable: true }, options?: any): void; beforeDatasetDraw?(chart: Chart, args: { index: number; meta: ChartMeta }): void; @@ -10,4 +14,4 @@ export interface ChartPlugin { afterDatasetDraw?(chart: Chart, args: { index: number; meta: ChartMeta }): void; afterDatasetsDraw?(chart: Chart, args?: unknown, options?: any): void; afterDraw?(chart: Chart): void; -} \ No newline at end of file +} diff --git a/frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts b/frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts new file mode 100644 index 00000000..ff1aa2ad --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts @@ -0,0 +1,96 @@ +import { + AdvancedProperty, + AnalyticalScope, + Behavior, + DateTimeUtil, + NotNull, + Visible +} from "@webbpm/base-package"; +import {Chart} from "chart.js"; +import {Moment} from "moment-timezone"; +import {ChartPlugin} from "./ChartPlugin"; +import {ChartUtils} from "../ChartUtils"; +import {ErvuChartV2} from "../ErvuChartV2"; + +@AnalyticalScope(ErvuChartV2) +export class DarkBackgroundColorChartPlugin extends Behavior implements ChartPlugin { + @Visible('false') + id: string = 'dark-background-color'; + @NotNull() + public dateFormat: string; + public lightness: number; // 0 - 100 для затемнения, для осветления > 100 + public dash: number; + public space: number; + @AdvancedProperty() + public date: Date; + + /** + * Затемнение цвета столбцов и добавление пунктира в линию для графика после текущей или заданной + * даты + */ + beforeDatasetsUpdate(chart: Chart, args?, options?): void { + const doLightness: boolean = !!this.lightness || this.lightness === 0; + const doDash: boolean = !!this.dash && !!this.space; + const date: Date = this.date == null ? new Date() : this.date; + const indexAxis = chart.config.options.indexAxis || 'x'; + const datasets = chart.config.data.datasets; + + if (doLightness) { + datasets.forEach(dataset => { + if (dataset.type === 'bar') { + const backgroundColor = dataset.backgroundColor; + if (typeof backgroundColor === 'string' && backgroundColor.length >= 7 + && backgroundColor.substr(0, 1) == '#') { + const colorHsl: string = ChartUtils.hexToHsl(backgroundColor, this.lightness); + if (colorHsl) { + const dateFormat = this.dateFormat; + dataset.backgroundColor = function (context) { + const scaleIndex = context.raw[indexAxis]; + const parsedMoment: Moment = DarkBackgroundColorChartPlugin.getParsedMoment( + scaleIndex, dateFormat); + const scaleDate = parsedMoment ? parsedMoment.toDate() : undefined; + return scaleDate > date ? colorHsl : backgroundColor; + } + } + } + } + }) + } + + if (doDash) { + datasets.forEach(dataset => { + if (dataset.type === 'line') { + const borderDash: number[] = [this.dash, this.space]; + const dateFormat = this.dateFormat; + Object.assign(dataset, { + segment: { + borderDash: function (context) { + const scaleIndex = context.p1.raw[indexAxis]; + const parsedMoment: Moment = DarkBackgroundColorChartPlugin.getParsedMoment( + scaleIndex, dateFormat); + const scaleDate = parsedMoment ? parsedMoment.toDate() : undefined; + return scaleDate > date ? borderDash : undefined; + } + } + }) + } + }) + } + } + + private static getParsedMoment(scaleIndex, dateFormat: string): Moment { + let moment: Moment = DateTimeUtil.parseDateWithFormat(scaleIndex, dateFormat); + switch (dateFormat) { + case "DD.MM.YYYY": + moment = DateTimeUtil.getEndOfDay(moment); + break; + case "MM.YYYY": + moment = moment.endOf('month'); + break; + case "YYYY": + moment = moment.endOf('year'); + break; + } + return moment; + } +} diff --git a/frontend/src/ts/modules/app/app-routing.module.ts b/frontend/src/ts/modules/app/app-routing.module.ts index 6e7ac34d..cedaf043 100644 --- a/frontend/src/ts/modules/app/app-routing.module.ts +++ b/frontend/src/ts/modules/app/app-routing.module.ts @@ -8,6 +8,11 @@ const appRoutes: Routes = [ path: 'access-denied', component: AccessDeniedComponent, canActivate: [ConfirmExitGuard] + }, + { + path: 'forecast', + loadChildren: 'generated-sources/page-forecast.module#PageforecastModule', + canActivate: [ConfirmExitGuard], }, { path: 'milregistration', diff --git a/packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml b/packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml index bba5ff21..8e80dfc3 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml +++ b/packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.cg.webbpm.packages.base resources - 3.185.0 + 3.185.1 Micord @@ -28,13 +28,13 @@ 3.19.3 5.10.2 true - 3.185.0 + 3.185.1 1.4.200 - 1107112530 + 1202100233 UTF-8 1.10.0 true - 3.185.0 + 3.185.1 typescript.metadata.json https://repo.micord.ru MMddHHmmss @@ -47,19 +47,19 @@ ru.cg.webbpm.packages.base converters - 3.185.0 + 3.185.1 compile ru.cg.webbpm.packages.base backend - 3.185.0 + 3.185.1 compile ru.cg.webbpm.packages.base frontend - 3.185.0 + 3.185.1 compile diff --git a/packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html b/packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html index 233b803f..ec9fa968 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html +++ b/packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html @@ -60,7 +60,7 @@
  • Образец внешней ссылки: https://www.wildberries.ru/catalog/${sku}/detail.aspx
  • -
  • Образец внутренней ссылки: products/ru.cg.webbpm.packages.base:resources:jar:3.185.0
  • +
  • Образец внутренней ссылки: products/ru.cg.webbpm.packages.base:resources:jar:3.185.1
  • diff --git a/packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml b/packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml index cdf7c0de..e528e7c3 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml +++ b/packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml @@ -4,17 +4,17 @@ Base webbpm package ru.cg.webbpm.packages.base resources - 3.185.0 - 3.185.0 + 3.185.1 + 3.185.1 ru.cg.webbpm.packages.base backend - 3.185.0 + 3.185.1 @webbpm/base-package - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component index 06f93a9d..4deb05c7 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component @@ -8,11 +8,11 @@ component/buttons/Кнопка.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component index 6d4eb40e..ea0ac5e6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_отмены.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component index 87f14aa1..08b6b834 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_очистки_фильтра.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component index 5ff29eb8..2257c2c8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_удаления.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component index 86721784..9952d8fa 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_загрузки.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component index 450fb368..022a962f 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_вызова_ошибки.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component index 9f0b2186..5c489b4b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component @@ -7,11 +7,11 @@ component/buttons/Кнопка_выполнения_бизнес-процесса.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component index 49c362ad..9fc7475e 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_выполнения_SQL.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component index f821b899..dc19c43a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_для_фильтрации.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component index b114af1f..c2f4dbae 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_навигации.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component index 7dea1100..e9bcdaed 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_сохранения.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component index 46684f2f..b9e05e48 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_выбора.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component index 6757c968..3c70171d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButtonV2.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_подписи.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component index 736e22f3..5f880137 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component @@ -8,11 +8,11 @@ component/buttons/Кнопка_запуска_бизнес-процесса.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component index 03c914fe..4502802b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component @@ -8,11 +8,11 @@ component/buttons/reporting/Кнопка_печати_из_графа_сущности.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component index e9931d0d..9fa4f24c 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component @@ -8,11 +8,11 @@ component/buttons/reporting/Кнопка_печати_отчета_из_формы.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component index 5346661d..d261b028 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component @@ -8,11 +8,11 @@ component/containers/Сворачиваемая_панель.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component index deafe125..0b3d89eb 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component @@ -8,11 +8,11 @@ component/containers/Диалог.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component index 0f8008b1..5ce638d7 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component @@ -8,11 +8,11 @@ component/containers/Контейнер_с_кнопками.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component index f1c15710..8d8f98c1 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component @@ -8,11 +8,11 @@ component/containers/Группа_полей.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component index 6831b81d..c603ce80 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component @@ -8,11 +8,11 @@ component/containers/Набор_фильтров.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component index 878f71fa..22ec96ac 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component @@ -8,11 +8,11 @@ component/containers/Форма.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component index 60549cab..0b9612c0 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component @@ -8,11 +8,11 @@ component/containers/Горизонтальный_контейнер.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component index b2c85583..30672132 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component @@ -8,11 +8,11 @@ component/containers/Контейнер_вкладок.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component index 9eccd00f..5e1125c0 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component @@ -8,11 +8,11 @@ component/containers/Вкладка.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component index 410f8701..604bb76d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component @@ -8,11 +8,11 @@ component/containers/Вертикальный_контейнер.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component index 8638c79f..4f9a338b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component @@ -8,11 +8,11 @@ component/containers/Окно.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component index 1a8891e7..15211a09 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component @@ -8,11 +8,11 @@ component/editable-grids/EditableGrid.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component index f36346dc..29858f0f 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/autocomplete false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component index 846b1b86..98401b03 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/check-box false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component index 4ebac501..857fa928 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/combo-box false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component index e1346149..2b4ed2b1 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/date-time-picker false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component index 218e0afb..8c04592e 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/money-field true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component index 302110c7..01ab89ca 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/number-field false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component index b78117ab..ebe88ec6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/one-to-many true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component index b1d95ae6..7bcec313 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/one-to-many false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component index 23ae0f25..ed3c7bc4 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component @@ -6,11 +6,11 @@ META-INF/components/localization/editable-grids/read-only true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component index 808f4f82..cf12508d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component @@ -5,11 +5,11 @@ editable-grids true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component index fbc66419..3a16ce1f 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component @@ -8,11 +8,11 @@ Статичный_выпадающий_список_колонки_таблицы.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component index 78a171fc..3693b878 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/text-area false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component index a542c0c9..7f20dc4e 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/text-field false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component index 0aac0806..56146ce5 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component @@ -7,11 +7,11 @@ META-INF/components/localization/editable-grids/time-picker false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component index 15c2b158..36a278a7 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component @@ -8,11 +8,11 @@ component/fields/ФИАС.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component index 7b55c6d9..25e609c6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component @@ -8,11 +8,11 @@ component/fields/Поле_ввода_с_подбором_значения.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component index 5a3df58f..e15a6597 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component @@ -8,11 +8,11 @@ component/fields/Флаг.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component index 5c7a12b9..57af1289 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component @@ -8,11 +8,11 @@ component/fields/Выпадающий_список.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component index 5310cdaf..19d627a3 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component @@ -8,11 +8,11 @@ component/fields/Дата.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component index cd983e5d..3c189b3d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component @@ -8,11 +8,11 @@ component/fields/EditableOneToMany.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component index ff17afb8..6e121c77 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component @@ -8,11 +8,11 @@ component/fields/Файл.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component index 69c44970..a22436b8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component @@ -8,11 +8,11 @@ component/fields/Файл.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component index 32a1be0e..abdaa071 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component @@ -8,11 +8,11 @@ component/fields/ManyToMany.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component index fd1795f6..dc1309c8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component @@ -8,11 +8,11 @@ component/fields/ManyToManyField.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component index 95d1e41e..459fe1ee 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component @@ -8,11 +8,11 @@ component/fields/Денежное_поле.html true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component index 8ce29bc8..b0cece94 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component @@ -8,11 +8,11 @@ component/fields/Числовое_поле.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component index c84d8840..cc4a4a1f 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component @@ -8,11 +8,11 @@ component/fields/OneToMany.html true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component index 057d391b..e573c324 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component @@ -8,11 +8,11 @@ component/fields/OneToMany.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component index 6c8e98e3..2096862b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component @@ -8,11 +8,11 @@ component/fields/Переключатель.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component index 9b1a232b..016233d0 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component @@ -8,11 +8,11 @@ component/fields/SignVerification.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component index 124039d3..7d0cd9a6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component @@ -8,11 +8,11 @@ component/fields/Статичный_выпадающий_список.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component index 56d65aec..eddbc105 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component @@ -8,11 +8,11 @@ component/fields/Статичный_переключатель.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component index 581b3c07..946a24ec 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component @@ -8,11 +8,11 @@ component/fields/Текст.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component index f472c5ac..440a8910 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component @@ -8,11 +8,11 @@ component/fields/Многострочное_поле.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component index 3a78cd67..3187af87 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component @@ -8,11 +8,11 @@ component/fields/Текстовое_поле.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component index 3ae006ca..9aee9e10 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component @@ -8,11 +8,11 @@ component/fields/Время.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component index d5bd7105..281078ea 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component @@ -8,11 +8,11 @@ component/fields/TreeField.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component index 9d822558..936d7a85 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component @@ -5,11 +5,11 @@ META-INF/components/localization/editable-grid true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component index 6aa78c2b..896d8c93 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component @@ -4,11 +4,11 @@ EditableOneToManyForm true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component index 383b0393..16bb2ab8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component @@ -5,11 +5,11 @@ META-INF/components/localization/fields/file-upload-field true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component index 37568a74..31adaee7 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_полю_адреса.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component index 9022711f..29400966 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component @@ -8,11 +8,11 @@ component/fields/filters/Поле_ввода_с_подбором_значения.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component index cda2e754..1560c4eb 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_компоненте_Флаг.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component index 63324785..599e883a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component @@ -8,11 +8,11 @@ component/fields/filters/Флаг.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component index b01e6cbf..5602b2ee 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_выпадающему_списку.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component index cb168e0e..ba69c317 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_дате.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component index 6a3583b5..1c9fe2b2 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_числовому_полю.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component index 3386bf48..ad640777 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component @@ -8,11 +8,11 @@ component/fields/filters/Переключатель.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component index 90895bea..6ceba924 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_статичному_выпадающему_списку.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component index 6b8b1efd..bc22d26d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component @@ -8,11 +8,11 @@ component/fields/filters/Фильтр_по_полю_многострочного_ввода.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component index 9fa91865..0ca84895 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component @@ -8,11 +8,11 @@ component/fields/filters/Текстовое_поле.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component index 05990209..ba84211a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component @@ -5,11 +5,11 @@ META-INF/components/localization/fields/link-field true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component b/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component index f1596e31..ab6ef910 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component @@ -5,11 +5,11 @@ META-INF/components/localization/fields/multi-value-field true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component index 680b5b09..7c1db605 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component @@ -8,11 +8,11 @@ component/grids/Таблица.html true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component index d1edb85d..7db30fb9 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component @@ -8,11 +8,11 @@ component/grids/Таблица.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component index 0c59aa21..804b5a04 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component @@ -6,11 +6,11 @@ META-INF/components/localization/grids/grid false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component index 865d0776..4ef9bdd8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component @@ -6,11 +6,11 @@ META-INF/components/localization/grids/grid false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component index f86c3c28..24dd218e 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component @@ -8,11 +8,11 @@ component/grids/Таблица_с_постраничным_отображением.html true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component b/packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component index 1820a5f6..2652f0c8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component @@ -8,11 +8,11 @@ component/grids/Древовидная_таблица.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component index 92a245b7..90edc078 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component @@ -8,11 +8,11 @@ component/uncategorized/Обработка_событий.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component index 56e1d6b2..91408e17 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component @@ -7,11 +7,11 @@ META-INF/components/localization/uncategorized/calendar false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component index 1d1f9cc5..dc523b92 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component @@ -8,11 +8,11 @@ component/uncategorized/Диаграмма.html true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component index f186d3a6..0f326f89 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component @@ -8,11 +8,11 @@ component/uncategorized/Диаграмма_chart-v2.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component index 0646afbf..9d2703fa 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component @@ -8,11 +8,11 @@ component/uncategorized/EventCalendar.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component index 8b9a72e0..78c42614 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component @@ -8,11 +8,11 @@ component/uncategorized/Диаграмма_Гантта_Календарный_план_.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component index a79da4fb..10421df7 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component @@ -8,11 +8,11 @@ component/uncategorized/HyperLink.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component index 8681cf6a..4e1b7ca8 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component @@ -8,11 +8,11 @@ component/uncategorized/IFrame.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component index 4fce768b..9bfa5858 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component @@ -8,11 +8,11 @@ component/uncategorized/InnerHtml.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component index 7722adec..cb98290a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component @@ -8,11 +8,11 @@ component/uncategorized/MenuGroup.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component index 29931328..3b5610c6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component @@ -7,11 +7,11 @@ component/uncategorized/MenuItem.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component index c87af5ec..b27b1ac0 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component +++ b/packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component @@ -8,11 +8,11 @@ component/uncategorized/ValidationController.html false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar b/packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar index 2ec0eb00..315b92aa 100644 Binary files a/packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar and b/packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar differ diff --git a/packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata b/packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata index 43c8bae5..35ff229e 100644 Binary files a/packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata and b/packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata differ diff --git a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component index 71533f2f..988134f4 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component +++ b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component @@ -4,11 +4,11 @@ ProcessInstance false -3.185.0 +3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component index a4d0ca5b..4875ea1b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component +++ b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component @@ -4,11 +4,11 @@ ProcessInstanceDiagram true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component index b4208242..294c1668 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component +++ b/packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component @@ -4,11 +4,11 @@ ProcessInstanceList false -3.185.0 +3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component index 03cc338a..df85685b 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component @@ -4,11 +4,11 @@ Groups false -3.185.0 +3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component index d4606b8d..cf36c5a5 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component @@ -4,11 +4,11 @@ GroupsCreate false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component index 4afd5a66..e6f94a67 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component @@ -4,11 +4,11 @@ GroupsEdit false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component index da080211..0db5226a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component @@ -4,11 +4,11 @@ OrganizationEdit false -3.185.0 +3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component index c968530c..b5edc682 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component @@ -4,11 +4,11 @@ Organizations false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component index 7a5d7a1f..88b7ddd6 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component @@ -4,11 +4,11 @@ Roles false -3.185.0 +3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component index 8ab3d115..5162f888 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component @@ -4,11 +4,11 @@ RolesEdit false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component index 0d720bb2..eea8a1ce 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component @@ -4,11 +4,11 @@ SecurityFeatures false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component index 080d91a3..86206d9a 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component @@ -4,11 +4,11 @@ StaticRouteNavigationButton true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component index 605faf6b..658a9ab4 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component @@ -4,11 +4,11 @@ StaticRouteSelectButton true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component index e82da6ac..152d0c43 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component @@ -4,11 +4,11 @@ UserForm true - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component index 6f40e83e..6cc6863d 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component @@ -4,11 +4,11 @@ Users false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component index b01e033c..4bbe72f0 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component @@ -4,11 +4,11 @@ UsersCreate false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component b/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component index 18d5cecf..0c32d8ab 100644 --- a/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component +++ b/packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component @@ -4,11 +4,11 @@ UsersEdit false - 3.185.0 + 3.185.1 ru.cg.webbpm.packages.base.resources - 3.185.0 + 3.185.1 diff --git a/pom.xml b/pom.xml index 7a3742cf..c28d9214 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ UTF-8 false 2.9.2 - 3.185.1 + 3.185.5-SNAPSHOT 72000 @@ -40,7 +40,7 @@ ru.cg.webbpm.packages.base backend - 3.185.0 + 3.185.5-SNAPSHOT xerces diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index 4ae17991..aab2ffa4 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -4383,7 +4383,6 @@ 640ac622-91a7-438d-b68d-596af564b389 Таблица данные true - false false diff --git a/resources/src/main/resources/business-model/forecast.page b/resources/src/main/resources/business-model/forecast.page new file mode 100644 index 00000000..0b801abf --- /dev/null +++ b/resources/src/main/resources/business-model/forecast.page @@ -0,0 +1,7132 @@ + + + forecast + + 3.185.1 + + + ru.cg.webbpm.packages.base.resources + 3.185.0 + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 39a64ada-c438-4485-b4da-5d9af8524755 + Вертикальный контейнер + true + false + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 82d9b6f2-e751-4fd6-9dfe-5069a4ad060e + Горизонтальный контейнер + true + false + + + + cssClasses + + + + "bread-crumb" + + + + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 38464241-49f1-412e-ba6a-bd2f6b1c7848 + Главная + false + false + + false + + + + StaticRouteNavigationButton + modules.user-management.component + + true + true + + + caption + +"Главная" + + + + disabled + +false + + + + route + +"back" + + + + visible + +true + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + f4b6deb3-b0f9-4706-8c9f-017afd838264 + / + false + false + + + + cssClasses + + + + "free-label" + + + + + + initialValue + +"/" + + + + label + +null + + + + + + + + + false + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + e503140f-1a5a-4357-be93-0b7e80e74c6e + Прогнозы + false + false + + false + + + + StaticRouteNavigationButton + modules.user-management.component + + true + true + + + caption + +"Прогнозы" + + + + disabled + +true + + + + route + +"back" + + + + visible + +true + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 25b0502a-abd9-4183-bfe7-f4ade3126f02 + Горизонтальный контейнер + true + false + + + + cssClasses + + + + "top-btn-block" + + + + + + + + true + + + service + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + +ProjectDefaultValueLoaderServiceImpl +service.loading + + + + + + + true + + + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 0c2bf290-24b3-425a-b75e-1610b42f66f7 + Combo box + false + false + false + + + + placeholder + +"Российская Федерация" + + + + visible + +false + + + + + + + + comboBoxService + + + + businessIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} + + + + columnSorts + + + + + + field + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + + sortOrder + +"ASC" + + + + + + + + + displayColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false + + + + + + + + + + + + + + + defaultValueColumn + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadType + +"BY_COLUMN" + + + + service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + + + + ComboboxFilterComponent + ervu-dashboard.component.filter + + true + true + + + isBusinessId + +true + + + + operation + +"EQUAL" + + + + + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 8da7bfe6-0fbc-48ba-b976-47efbbce472f + DropdownTreeView + false + false + + + + collapseLevel + +2.0 + + + + + + + + treeItemService + + + + businessIdColumn + + {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"} + + + + idColumn + + {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"} + + + + labelColumn + + {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"shortname"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":234.0,"y":239.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"ervu_dashboard","x":234.0,"y":239.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":234.0,"y":239.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + parentIdColumn + + {"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"parent_id"} + + + + + + + + + + DropdownTreeViewFilterComponent + ervu-dashboard.component.filter + + true + true + + + isBusinessId + +true + + + + operation + +"EQUAL" + + + + + + + bce312bd-0c82-45e5-89dc-a1af90431c18 + e07d28f8-fe6c-4e18-90e0-191d2f86a9e2 + Статичный выпадающий список + false + true + + + f9a38417-9ad0-412a-9b5f-bbeb450dddd6 + 52b689fd-097c-44e4-8e17-c862e9844a13 + Поиск + false + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 07f4d0a6-19fc-4323-93db-8883f1068632 + Горизонтальный контейнер + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + aff4ffb7-2952-4604-a797-4b0eb30902f5 + Кнопка + false + false + + false + + +caption + + "Перейти к рейтингам" + + + + + + + StaticRouteNavigationButton + modules.user-management.component + + true + true + + +caption + + "Перейти к рейтингам" + + + +disabled + + false + + + +route + + "/ratings" + + + +visible + + true + + + + + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 5e86f0de-3d5b-405b-826a-d446a2ec915f + DropdownTreeView + false + true + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 084a672d-af4e-4002-87c2-ba7c65f67958 + Кнопка + false + false + + + +caption + + "Перейти к карте" + + + +visible + + false + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + a0d35ccd-9bf3-42be-acaf-9ae3faa6a463 + Кнопка + false + false + + false + + +caption + + "Поиск граждан в реестре" + + + + + + + StaticRouteNavigationButton + modules.user-management.component + + true + true + + +caption + + "Поиск граждан в реестре" + + + +route + + "/citizen" + + + +visible + + true + + + + + + + + 8e1d9023-42c0-4960-9c59-02f4f0c2e4dd + d701a3f4-e0ee-4766-8ee2-01c1bcf40dd4 + Пополняемый список зависимых записей + true + true + + + aeade2d9-067e-4381-9664-ff5a3320613d + c8b82004-7cc8-4440-8f1b-057ef8332223 + Список с поиском для выбора одного значения + true + true + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f98a0fad-8f59-4846-8b13-92e29b65b52a + Вертикальный контейнер + true + false + + + + cssClasses + + + + "parent-block" + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 1112dc48-3e9d-438d-801b-34422b38f60e + ГК Первый ряд + true + false + + + + cssClasses + + + + + + + + + + + + style + + + + width + + "50%" + + + + + + + + + + + + + 56d5ae60-a4b3-4f98-947b-6654cb4d400b + 19ab8905-e13e-4de2-a338-b5290e62dd9e + Контейнер вкладок + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c99d8040-555a-4005-832c-8a75b1cde053 + ВК Динамика количества граждан на учете + true + false + + + +cssClasses + + + + "child-block" + + + + + + + + + +style + + + + width + + null + + + + + + + + + + +service + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 7e8746f0-1ff0-42bd-955b-0c15a83d37d4 + Динамика количества граждан на учете + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Динамика количества граждан на учете" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 6ccd0dc6-8594-4477-ac10-6fe9331a659d + ГК График и показатели + true + false + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 66529bfd-f2ef-498c-93b1-e30fe702b5e8 + Горизонтальный контейнер + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + de763c9a-3afb-481e-83e5-c3a83a320711 + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "60%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +56ee13a4-f612-4168-8db8-2c4ef93e22c5 +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + limit + + null + + + + loadDao + + + + datasourceJndiName + + null + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"registered_citizens":{"tableName":"registered_citizens","schemaName":"forecast","x":356.0,"y":145.0,"alias":"registered_citizens","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"GREATER_OR_EQUAL","typeCode":"CONST","values":["\"2020-01-01T00:00:00\""]},{"column":{"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"},"operation":"LESS_OR_EQUAL","typeCode":"CONST","values":["\"2029-12-31T00:00:00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + + staticData + + + + + + backgroundColor + + "#E24040FF" + + + + borderColor + + "#E24040FF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"count_all"} + + + + dataColumnFormatter + + + + + + dataLabel + + " " + + + + drawOrder + + null + + + + labelColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"} + + + + labelColumnFormatter + + + YearFormatter + custom.grid.formatter + + + + + stack + + null + + + + tension + + "0.4" + + + + + + + + + + + backgroundColor + + "#17A8FAFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"women_military_specialty"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"} + + + + labelColumnFormatter + + + YearFormatter + custom.grid.formatter + + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#00DB5BFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"reaching_17_age"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"registered_citizens","entity":"registered_citizens","name":"recording_date"} + + + + labelColumnFormatter + + + YearFormatter + custom.grid.formatter + + + + + stack + + "one" + + + + + + + + + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + barPercentage + + 1.0 + + + + barThickness + + null + + + + borderRadius + + 12.0 + + + + borderWidth + + null + + + + categoryPercentage + + 0.8 + + + + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BarStackMiddleBorderRoundingChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + DarkBackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + dash + + 10.0 + + + + dateFormat + + "YYYY" + + + + lightness + + 50.0 + + + + space + + 6.0 + + + + + + + FilterReferences + ru.micord.ervu_dashboard.component.filter + + true + true + + + references + + + + + +column + + "recruitment_id" + + + +dataConverter + + + UUIDValueConverter + ru.micord.ervu_dashboard.component.converter + + + + +filterComponent + + {"objectId":"8da7bfe6-0fbc-48ba-b976-47efbbce472f","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + + + +table + + "registered_citizens" + + + + + StaticFilterReference + ru.micord.ervu_dashboard.component.filter + + + + + + + + + + FilterGroupDelegate + ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"8da7bfe6-0fbc-48ba-b976-47efbbce472f","packageName":"ervu-dashboard.component.filter","className":"DropdownTreeViewFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + fd83bbd3-7ef2-4fca-8b07-10f8a555754a + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "40%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +472b80c1-e78d-4170-8d16-c1a5aefec69b +Выбрать период +false +true + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +66529bfd-f2ef-498c-93b1-e30fe702b5e8 +Фильтр +true +true + + +fd7e47b9-dce1-4d14-9f3a-580c79f59579 +c9d19be7-5856-4da6-8d9a-b05232f72cbf +Применить +false +true + + +312c9663-86b4-4672-97bd-67d313585c00 +6415ca58-145a-4fff-9a6c-06b35a2d92fd +Числовое поле +false +true + + +312c9663-86b4-4672-97bd-67d313585c00 +46bbc703-9a8a-4b37-8af9-34f1a0fbec46 +Числовое поле +false +true + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +b0e4a6c4-3bab-4d92-8d8c-3a389894fdea +- - - Всего на учете +false +false + + + + cssClasses + + + + "col-red" + + + + + "free-label" + + + + + + + + + + initialValue + + "Всего на учете" + + + + label + + "- - -" + + + + + + + + + false + + + + TextBuilder + component.util + + true + + + parts + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +c3daba00-a0b0-41b6-89e5-846f759a53ea +Поставлено на учет, в т.ч.: +false +false + + + + cssClasses + + + + + + initialValue + + "Поставлено на учет, в т.ч.:" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +7d7aef4d-27ff-455c-967b-f5a30c698f84 +В год достижения 17 лет +false +false + + + + cssClasses + + + + "legend-col-green" + + + + + + + + + + initialValue + + "В год достижения 17 лет" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +808a4768-3f00-4c1d-ac94-bf925189696e +Женщины, получившие ВУС +false +false + + + + cssClasses + + + + "legend-col-blue" + + + + + + + initialValue + + "Женщины, получившие ВУС" + + + + label + + null + + + + + + + + + false + + + + + + 56d5ae60-a4b3-4f98-947b-6654cb4d400b + 19ab8905-e13e-4de2-a338-b5290e62dd9e + Контейнер вкладок + true + true + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 284f7a05-8dcf-4e0f-a490-1fe24952ce1d + ГК Второй ряд + true + false + false + + + + cssClasses + + + + + + + + + + + + visible + +false + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + e04b4910-80e6-4ecc-9ffa-abbeed76af44 + ВК Подлежат постановке на учет + true + false + + + +cssClasses + + + + "child-block" + + + + + + + + +style + + + + width + + null + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 19b03582-7dda-47ee-b2f0-8b6b2a3d50ee + Подлежат постановке на учет + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Подлежат постановке на учет" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 61e3e979-c9ab-4774-b6df-7a467dc03c41 + ГК График и показатели + true + false + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8e9d9e68-2a43-4163-9f12-e10d762c802a + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "65%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +9e16c702-8715-45f1-ad5b-2347c873db09 +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"enroll","schemaName":"forecast","x":206.0,"y":249.0,"alias":"enroll","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"enroll","schemaName":"forecast","x":206.0,"y":249.0,"alias":"enroll","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"enroll":{"tableName":"enroll","schemaName":"forecast","x":206.0,"y":249.0,"alias":"enroll","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + staticData + + + + + + + + backgroundColor + + "#00DB5BFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"study"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#17A8FAFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"work"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"work"} + + + + labelColumnFormatter + + + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#D98200FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"unemployed"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"unemployed"} + + + + labelColumnFormatter + + + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#DB5C00FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_17_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_17_years"} + + + + labelColumnFormatter + + + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#D9AF19FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_18_26_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_18_26_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#F91E11FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_27_30_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_27_30_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#4C55FFFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_31_35_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_31_35_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#00FBFFFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_36_40_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_36_40_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#B200FFFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_41_45_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_41_45_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#A13041FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_46_50_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_46_50_years"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#A1B196FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_51_years"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"enroll","entity":"enroll","name":"count_51_years"} + + + + stack + + "two" + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + false + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + barPercentage + + 1.0 + + + + borderRadius + + 15.0 + + + + borderWidth + + null + + + + categoryPercentage + + 0.95 + + + + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BarStackMiddleBorderRoundingChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2df73ff5-6a4c-49b2-9c38-d13a8db8c188 + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "20%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +1fd7fe97-7e0c-4935-a98f-5604c7224512 +Занятость +false +false + + + + cssClasses + + + + + + initialValue + + "Занятость" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +82f7bc6b-5c2e-4c1d-a506-0cb141e08987 +Учатся +false +false + + + + cssClasses + + + + "legend-col-green" + + + + + + + initialValue + + "Учатся" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +ec65e8a9-6bd1-438b-93d0-3f53d25d2afa +Работают +false +false + + + + cssClasses + + + + "legend-col-blue" + + + + + + + + + initialValue + + "Работают" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +ae273f82-8840-4486-a5fe-dc5e6d348e9f +Безработные +false +false + + + + cssClasses + + + + "legend-col-orange" + + + + + + + + initialValue + + "Безработные" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +1e0e1b8a-3ba8-4e69-a0a4-dd1d9f35bb57 +Возраст +false +false + + + + cssClasses + + + + + + + initialValue + + "Возраст" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +2b16788a-4c7a-4fa0-bcd5-74576bc55927 +17 л. +false +false + + + + cssClasses + + + + "legend-col-orange-dk" + + + + + + + + initialValue + + "17 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +76a4bc42-aaf2-45dc-874e-1f13e6980aab +18-26 л. +false +false + + + + cssClasses + + + + "legend-col-yellow" + + + + + + + initialValue + + "18-26 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +d8090673-57e5-46be-aadc-190776a98761 +27-30 л. +false +false + + + + cssClasses + + + + "legend-col-red" + + + + + + + initialValue + + "27-30 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +a1c3bafe-cb6a-4f10-882a-47ce26023482 +31-35 л. +false +false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + + initialValue + + "31-35 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +fc780ae9-e1d1-4be5-b2ec-6a8564bb3e20 +36-40 л. +false +false + + + + cssClasses + + + + "legend-col-blue-lt" + + + + + + + + initialValue + + "36-40 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +a4df371f-b45e-4aa8-8390-15221da643f7 +41-45 л. +false +false + + + + cssClasses + + + + "legend-col-lila" + + + + + + + initialValue + + "41-45 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +c909e22c-5c9a-42a1-b264-7ae201752467 +46-50 л. +false +false + + + + cssClasses + + + + "legend-col-coral" + + + + + + + initialValue + + "46-50 л." + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +20eaed6e-396a-422a-ab6c-4441c3a4167a +51+ л. +false +false + + + + cssClasses + + + + "legend-col-olive" + + + + + + + initialValue + + "51+ л." + + + + label + + null + + + + + + + + + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 1dfc545d-a7b9-435b-b2ac-e1cf38248bab + ВК Решения о принятии и снятии временных мер + true + false + false + + + +cssClasses + + + + "child-block" + + + + + + + + +style + + + + width + + null + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + bc97c1ef-fa0f-4eff-84db-4f4e5542b083 + Решения о принятии и снятии временных мер + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Решения о принятии и снятии временных мер" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 23e13651-52c1-436b-b3cf-bed0b586999d + ГК График и показатели + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + ca704293-7a1e-40e9-b99a-d4b674b87b9d + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "65%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +fedb970f-2f9c-4319-8b6f-514119cc0781 +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"temporary_measures","schemaName":"forecast","x":312.0,"y":187.0,"alias":"temporary_measures","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"temporary_measures","schemaName":"forecast","x":312.0,"y":187.0,"alias":"temporary_measures","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"temporary_measures":{"tableName":"temporary_measures","schemaName":"forecast","x":312.0,"y":187.0,"alias":"temporary_measures","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"temporary_measures","entity":"temporary_measures","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + staticData + + + + + + backgroundColor + + "#FFC737FF" + + + + borderColor + + "#FFC737FF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"temporary_measures","entity":"temporary_measures","name":"introduction_provisional_measures"} + + + + dataColumnFormatter + + + + + + dataLabel + + " " + + + + drawOrder + + null + + + + labelColumn + + {"schema":"forecast","table":"temporary_measures","entity":"temporary_measures","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + null + + + + tension + + "0.4" + + + + + + + + + + + + + backgroundColor + + "#00F0FFFF" + + + + borderColor + + "#00F0FFFF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"temporary_measures","entity":"temporary_measures","name":"lifting_provisional_measures"} + + + + dataLabel + + " " + + + + drawOrder + + 4 + + + + labelColumn + + {"schema":"forecast","table":"temporary_measures","entity":"temporary_measures","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + tension + + "0.4" + + + + + + + + + + + + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + shadowBar + + null + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + false + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + borderRadius + + null + + + + + + + scales + + + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 644aa8e0-ce14-4380-a59d-5319102b8ea3 + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "35%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +a6c1741f-b1b2-4686-9e4b-bffd624adc43 +Введение временных мер +false +false + + + + cssClasses + + + + + + initialValue + + "- - - Введение временных мер" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +2cd201cb-501e-4a51-8ad3-b4bd6258cdb1 +Снятие временных мер +false +false + + + + cssClasses + + + + + + initialValue + + "- - - Снятие временных мер" + + + + label + + null + + + + + + + + + false + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 3b415346-1600-4ab3-b989-dde233b1e379 + ГК Третий ряд + true + false + false + + + + cssClasses + + + + + + + + + + + + visible + +false + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c46c44ab-a006-44de-995a-e5bb3797acc5 + ВК Обжалования + true + false + false + + + +cssClasses + + + + "child-block" + + + + + + + + + +style + + + + width + + null + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 32ae8d81-e29d-4421-9b97-f5e2be16c604 + Обжалования + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Обжалования" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 2dd39b02-9160-4f2e-94e0-84b0ccea43db + ГК График и показатели + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 2ace8a04-b77a-4a16-8f20-50bd024dd45d + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "65%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +b760a92f-502e-4bbd-9e59-50372006c1e0 +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"forecast","x":329.0,"y":224.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"forecast","x":329.0,"y":224.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"forecast","x":329.0,"y":224.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + staticData + + + + + + backgroundColor + + "#00F0FFFF" + + + + borderColor + + "#00F0FFFF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"resolved_appeals"} + + + + dataColumnFormatter + + + + + + dataLabel + + " " + + + + drawOrder + + null + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + null + + + + tension + + "0.4" + + + + + + + + + + + backgroundColor + + "#00DB5BFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"document_retrieval"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"document_retrieval"} + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#17A8FAFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"retraction_complaint"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"retraction_complaint"} + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#D98200FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"disagreement_decision"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"disagreement_decision"} + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#F91E11FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"incorrect_information"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"incorrect_information"} + + + + stack + + "one" + + + + + + + + + + + + + backgroundColor + + "#DB5C00FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"maintaining_military_records"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"maintaining_military_records"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#D9AF19FF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"conscription"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"conscription"} + + + + stack + + "two" + + + + + + + + + + backgroundColor + + "#4C55FFFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"temporary_measures"} + + + + dataLabel + + " " + + + + labelColumn + + {"schema":"forecast","table":"appeals","entity":"appeals","name":"temporary_measures"} + + + + stack + + "two" + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + barPercentage + + 1.0 + + + + barThickness + + null + + + + borderRadius + + 15.0 + + + + borderWidth + + null + + + + categoryPercentage + + 0.95 + + + + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BarStackMiddleBorderRoundingChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + adfdfa1b-c143-4043-bff7-dc1c8804f740 + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "35%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +b622c29e-9474-4850-a194-cd902eece25e +Решенные обжалования +false +false + + + + cssClasses + + + + + + initialValue + + "- - - Решенные обжалования" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +dc6a6b4f-61cb-419e-af50-7d792753373d +Причины обжалований +false +false + + + + cssClasses + + + + + + initialValue + + "Причины обжалований" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +472ae2a4-cb3a-4a00-8f81-8a1cafca8324 +Досыл документов +false +false + + + + cssClasses + + + + "legend-col-green" + + + + + + + + + initialValue + + "Досыл документов" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +589b9743-e5dc-45d4-82b7-9a9e4ca5636d +Отзыв жалобы +false +false + + + + cssClasses + + + + "legend-col-blue" + + + + + + + initialValue + + "Отзыв жалобы" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +b205a15c-ab34-430e-b5d5-a2827b057284 +Несогласие с решением +false +false + + + + cssClasses + + + + "legend-col-orange" + + + + + + + initialValue + + "Несогласие с решением" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +3dd4929f-9260-4dad-9f32-c2d60af75b61 +Некорректные данные +false +false + + + + cssClasses + + + + "legend-col-red" + + + + + + + + initialValue + + "Некорректные данные" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +785b3ddd-bef0-4aec-85e9-0bc8b20a80cc +Тема обжалования +false +false + + + + cssClasses + + + + + + initialValue + + "Тема обжалования" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +e3be961b-38b2-43a2-9ae7-7e43327b728e +Ведение воинского учета +false +false + + + + cssClasses + + + + "legend-col-orange-dk" + + + + + + + initialValue + + "Ведение воинского учета" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +e951635b-8a43-4803-8304-d4f1855da8fb +Призыв на службу +false +false + + + + cssClasses + + + + "legend-col-yellow" + + + + + + + initialValue + + "Призыв на службу" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +0d870882-e99b-4d38-bcf2-40db85a99bfa +Временные меры +false +false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + + + initialValue + + "Временные меры" + + + + label + + null + + + + + + + + + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + d00fd85d-2cde-4791-a09b-aaba39f21c11 + ВК Отсрочка от призыва + true + false + false + + + +cssClasses + + + + "child-block" + + + + + + + + +style + + + + width + + null + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + b4b9581b-9d9b-432d-be73-f1a8572f1216 + Отсрочка от призыва + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Отсрочка от призыва" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 8e21d631-f928-4ac0-bd68-eba8e9418797 + ГК График и показатели + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 589c1533-1993-47ee-a3f9-7d5e11162073 + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "65%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +d4807fbb-819b-4cd3-af75-5504a95d3c15 +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"deferment_conscription","schemaName":"forecast","x":388.0,"y":221.0,"alias":"deferment_conscription","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"deferment_conscription","schemaName":"forecast","x":388.0,"y":221.0,"alias":"deferment_conscription","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"deferment_conscription":{"tableName":"deferment_conscription","schemaName":"forecast","x":388.0,"y":221.0,"alias":"deferment_conscription","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"deferment_conscription","entity":"deferment_conscription","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + staticData + + + + + + backgroundColor + + "#D98200FF" + + + + borderColor + + "#D98200FF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"deferment_conscription","entity":"deferment_conscription","name":"eligible_deferment"} + + + + dataColumnFormatter + + + + + + dataLabel + + " " + + + + drawOrder + + null + + + + labelColumn + + {"schema":"forecast","table":"deferment_conscription","entity":"deferment_conscription","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + null + + + + tension + + "0.4" + + + + + + + + + + + + + backgroundColor + + "#00DB5BFF" + + + + borderColor + + "#00DB5BFF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"deferment_conscription","entity":"deferment_conscription","name":"deferment_granted"} + + + + dataLabel + + " " + + + + drawOrder + + 4 + + + + labelColumn + + {"schema":"forecast","table":"deferment_conscription","entity":"deferment_conscription","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + tension + + "0.4" + + + + + + + + + + + + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + shadowBar + + null + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + borderRadius + + null + + + + + + + scales + + + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 21aaf437-635b-4ded-8516-9564b65209eb + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "35%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +86009d7f-9416-4633-9a51-d36a6022ee77 +Имеют право на отсрочку +false +false + + + + cssClasses + + + + + + initialValue + + "- - - Имеют право на отсрочку" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +4b4e4132-ca1b-41de-96b4-df46be56a6bb +Предоставлена отсрочка +false +false + + + + cssClasses + + + + + + initialValue + + "- - - Предоставлена отсрочка" + + + + label + + null + + + + + + + + + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 1009205d-99fd-4def-8a25-ed970598c76f + ВК Явка в Военный комиссариат + true + false + false + + + +cssClasses + + + + "child-block" + + + + + + + + + + +style + + + + width + + "50%" + + + + + + +visible + + false + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d5c6091d-d08f-489d-86f2-2527e6f21e59 + Явка в Военный комиссариат + false + false + + + + cssClasses + + + + "title" + + + + + + + initialValue + + "Динамика количества граждан на учете" + + + + label + + null + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + fee87633-a56c-47b3-9438-c0a9220f4604 + ГК График и показатели + true + false + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + b6ea800c-9238-4c8e-836e-ba2c47a88270 + ВК График + true + false + + + + style + + + + height + + null + + + + width + + "50%" + + + + + + + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +166a311d-f9ef-49fe-a9dc-f31bd0c0f9fa +ChartV2 +true +false + + false + false + + + + + chartService + + + + chartType + + "LINE" + + + + dataSetServices + + + + + + datasetType + + "STATIC" + + + + limit + + 12 + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"reporting_military_commissariat","schemaName":"forecast","x":303.0,"y":217.0,"alias":"reporting_military_commissariat","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"reporting_military_commissariat","schemaName":"forecast","x":303.0,"y":217.0,"alias":"reporting_military_commissariat","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"reporting_military_commissariat":{"tableName":"reporting_military_commissariat","schemaName":"forecast","x":303.0,"y":217.0,"alias":"reporting_military_commissariat","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + staticDataSet + + + + columnSorts + + + + + + field + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + staticData + + + + + + backgroundColor + + "#E24040FF" + + + + borderColor + + "#E24040FF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"subpoenaed_appear"} + + + + dataColumnFormatter + + + + + + dataLabel + + " " + + + + drawOrder + + null + + + + labelColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + null + + + + tension + + "0.4" + + + + false + + + + + + + + + + backgroundColor + + "#D04EFFFF" + + + + borderColor + + "#D04EFFFF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"missed_deadline"} + + + + dataLabel + + " " + + + + drawOrder + + 4 + + + + labelColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + tension + + "0.4" + + + + false + + + + + + + backgroundColor + + "#FFC737FF" + + + + borderColor + + "#FFC737FF" + + + + chartType + + "LINE" + + + + dataColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"missed_deadline_reason"} + + + + dataLabel + + " " + + + + drawOrder + + 5 + + + + labelColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + tension + + "0.4" + + + + false + + + + + + + backgroundColor + + "#17A8FAFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"retrieved_7_days"} + + + + dataLabel + + " " + + + + drawOrder + + 12 + + + + labelColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + "one" + + + + + + + + + + backgroundColor + + "#00DB5BFF" + + + + chartType + + "BAR" + + + + dataColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"subpoenas_issued"} + + + + dataLabel + + " " + + + + drawOrder + + 13 + + + + labelColumn + + {"schema":"forecast","table":"reporting_military_commissariat","entity":"reporting_military_commissariat","name":"recording_date"} + + + + labelColumnFormatter + + + DateFormatter + custom.grid.formatter + + + + + stack + + "one" + + + + + + + + + + + + + + + + + + + + + ErvuMultiChartDataSetService + ru.micord.ervu_dashboard.component.chart + + + + + + + hoverRadius + + null + + + + + + + + + + ErvuChartV2 + ervu-dashboard.component.chart + + true + true + + + bars + + + + shadowBar + + null + + + + x + + + + grace + + null + + + + grid + + + + display + + false + + + + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + y + + + + grace + + null + + + + grid + + + + display + + false + + + + false + + + + ticks + + + + color + + "#F4FCFFFF" + + + + display + + true + + + + + + + + + + + + + indexAxis + + "x" + + + + legend + + + + display + + false + + + + + + + loadOnStart + + true + + + + options + + + + barPercentage + + 1.0 + + + + borderRadius + + 20.0 + + + + categoryPercentage + + 0.95 + + + + + + + scales + + + false + + + + style + + + + height + + "300px" + + + + margin + + null + + + + + + + visible + + true + + + + + + + BarStackMiddleBorderRoundingChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + + BackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + color + + "#F4FCFF0D" + + + + onlyChartArea + + true + + + + + + + DarkBackgroundColorChartPlugin + ervu-dashboard.component.chart.plugin + + true + true + + + dash + + 10.0 + + + + dateFormat + + "DD.MM.YYYY" + + + + lightness + + 60.0 + + + + space + + 6.0 + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 75c32025-162c-48cb-81d1-f399dcad98c6 + ВК Показатели + true + false + + + + cssClasses + + + + "graph-legend" + + + + + + + style + + + + width + + "40%" + + + + + + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +1985d7d6-df8d-4a38-afc5-e7de04a12d28 +- - - Явились по повесткам +false +false + + + + cssClasses + + + + "free-label" + + + + + "col-red" + + + + + + + initialValue + + "Явились по повесткам" + + + + label + + "- - - " + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +23667cf3-ca52-48c7-b6a6-a066b0dc4df0 +- - - Не явились в срок +false +false + + + + cssClasses + + + + "free-label" + + + + + "col-lila" + + + + + + + initialValue + + "Не явились в срок" + + + + label + + "- - -" + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +d8eb6d7f-8752-402a-9057-b03fb683374a +- - - Не явились по уважительной причине +false +false + + + + cssClasses + + + + "free-label" + + + + + "col-yellow" + + + + + + + + initialValue + + "Не явились по уважительной причине" + + + + label + + "- - -" + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +5ebc0b17-a2ac-4367-be38-32ee405c41f3 +Вручено повесток +false +false + + + + cssClasses + + + + "legend-col-green" + + + + + + + initialValue + + "Вручено повесток" + + + + label + + null + + + + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +b4487e14-2cab-4f49-a365-a084ede147df +Вручено через 7 дней(автоматически) +false +false + + + + cssClasses + + + + "legend-col-blue" + + + + + + + initialValue + + "Вручено через 7 дней(автоматически)" + + + + label + + null + + + + + + + + + false + + + + + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 2caae930-270e-4616-8575-65b7a5be556e + Кнопка (нужно будет удалить) - страница "Карточка физ. лица" + false + true + + + diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 59065557..caf18ace 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -473,7 +473,6 @@ 9021abd0-d34a-43f2-a12d-649e728db7b1 Горизонтальный контейнер true - false false @@ -493,6 +492,58 @@ + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 + 9c683d50-9d7e-4958-9ec3-1af48401f73e + Кнопка + false + false + + false + + +caption + + "Перейти к прогнозам" + + + + + + + StaticRouteNavigationButton + modules.user-management.component + + true + true + + +caption + + "Перейти к прогнозам" + + + +disabled + + false + + + +route + + "/forecast" + + + +visible + + true + + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 cbe96dc1-3df8-401e-baba-8067b8d74b08 @@ -831,7 +882,6 @@ 1554f4b4-ffd6-4449-9751-628dd1dcbd6d Вертикальный контейнер true - false false @@ -2036,7 +2086,6 @@ - false @@ -2633,7 +2682,6 @@ a534271f-5e5f-4cba-8343-25fce6d6e2e5 HB - Контрактной службы true - false false @@ -2968,7 +3016,6 @@ 1316951f-13ef-4bb8-bdf7-1ab12bec5693 HB - Мобилизации true - false false