diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 86a7bc63..90eb8efb 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -2014,7 +2014,12 @@ - false + + + + noDataText + + "0" @@ -2064,28 +2069,6 @@ "#B3B3B3FF" - - family - - null - - - - labelAxis - - - number - - - null - - - - size - - null - - useStaticColor @@ -3131,7 +3114,6 @@ bc72b920-b037-453b-b7d6-2aae8a5ab38d VB - Подлежат постановке на учет true - false false @@ -3317,7 +3299,6 @@ 5d23344d-2a90-488c-b936-440edc766dcc Вертикальный контейнер true - false false @@ -4204,7 +4185,6 @@ ec109c35-b859-43cc-ae23-df59e10a11b0 Вертикальный контейнер true - false false @@ -4318,31 +4298,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -4360,41 +4421,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -4456,7 +4530,7 @@ grace -"10%" +"50%" @@ -4520,6 +4594,12 @@ + + noDataText + + "0" + + style @@ -4566,6 +4646,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 4943a042..584b4ed3 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -717,7 +717,6 @@ 3cd1c88a-a967-4ede-8090-685369098604 Всего состоят на учете true - false false @@ -1772,31 +1771,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1814,39 +1894,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1908,7 +2003,7 @@ grace -"10%" +"50%" @@ -2018,6 +2113,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index 1e460e12..cd7eb4a0 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -296,13 +296,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 49393e6f-f349-4f15-99ca-f0f3e794f67d - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 f3ba1055-e764-420f-9c42-3232bbcbb321 @@ -704,7 +697,6 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true - false false @@ -1806,32 +1798,112 @@ - datasetsConfiguration + chartType - - - datasets - - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной слуюжбы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1849,39 +1921,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1949,7 +2036,7 @@ grace -"10%" +"50%" @@ -2015,6 +2102,12 @@ + + noDataText + + "0" + + style @@ -2061,6 +2154,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index c973878e..b4d3c8e8 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -2931,7 +2931,6 @@ 0a07229f-1c03-4f45-8651-c70f6b68df74 VB - Повестки true - false false @@ -3660,10 +3659,10 @@ - false + false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -3681,6 +3680,7 @@ ervu-dashboard.component.chart true + true cssClasses @@ -6514,6 +6514,7 @@ ervu-dashboard.component.chart true + true bars @@ -8854,6 +8855,7 @@ 6da4fd55-7c44-452f-bb1b-c7bc75ab21fd VB - Обжалование true + false false diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index 049b20b0..d60ab38d 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -287,13 +287,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 01426200-9f22-492e-a812-b9d08afd02ce - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 bcda3e31-265c-4f80-8984-fd0359b0fc36 @@ -688,7 +681,6 @@ 1c6c88af-a164-4e0d-9cbb-a6bc59d30414 Всего состоят на учете true - false false @@ -1876,31 +1868,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1918,40 +1991,60 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + datasourceJndiName + + null + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -2013,7 +2106,7 @@ grace -"10%" +"50%" @@ -2075,6 +2168,13 @@ + false + + + + noDataText + + "0" @@ -2123,6 +2223,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -7644,6 +7828,7 @@ a00e8828-e03e-434a-98f8-7dfd6575a687 VB - Повестки true + false false @@ -8351,6 +8536,7 @@ ervu-dashboard.component.chart true +true cssClasses