From a66cec914336453aff635be0c8c23d30a45ff090 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Thu, 14 Nov 2024 11:03:40 +0300 Subject: [PATCH] =?UTF-8?q?=D1=86=D0=B5=D0=BD=D1=82=D1=80=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=B8=20=D0=BD=D0=B0=D0=B6=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu-business-metrics/conversion.page | 207 +++++++++++++++--- .../initial_registration.page | 161 +++++++++++++- 2 files changed, 330 insertions(+), 38 deletions(-) diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page index ff5a4e8..83692b6 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page @@ -26,6 +26,7 @@ ca19ee9e-5b4b-4ed4-b20d-cc4dc772a09e ГК Выпадающие списки true + false false @@ -1626,7 +1627,7 @@ label - "Загрузка записей из ЕАСУ \"Горизонт-МР\" - ТБД МО" + "Загрузка записей из ЕАСУ \"Горизонт-МР\" - ТБД МО (файл в csv)" @@ -2447,13 +2448,30 @@ label - "95%" + null textFormatter - + + + unitsLabel + +"%" + + + + unitsText + +{"objectId":"2f993951-8c36-4640-856a-5ab477000709","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + @@ -2646,13 +2664,30 @@ label - "56%" + null textFormatter - + + + unitsLabel + +"%" + + + + unitsText + +{"objectId":"5d79ceba-c6d8-4964-8dff-668831000c79","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + @@ -2764,7 +2799,7 @@ initialValue - "записей идентифицированы в ГИР ВУ" + "записей граждан с ошибками ФЛК и дубликаты" @@ -3061,6 +3096,79 @@ centerLabelConfigurations + + + + + aggregationFunction + + "SUM" + + + + color + + "#FFFFFFFF" + + + + font + + + + family + + "Gilray" + + + + size + + 50 + + + + weight + + "800" + + + + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_not_identifited_records","schemaName":"metrics","x":334.0,"y":196.0,"alias":"convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":169.0,"y":196.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"view_convert_info_not_identifited_records","schemaName":"metrics","x":512.0,"y":195.0,"alias":"view_convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_not_identifited_records","schemaName":"metrics","x":334.0,"y":196.0,"alias":"convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":169.0,"y":196.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_convert_info_not_identifited_records","schemaName":"metrics","x":512.0,"y":195.0,"alias":"view_convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":169.0,"y":196.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_convert_info_not_identifited_records":{"tableName":"view_convert_info_not_identifited_records","schemaName":"metrics","x":512.0,"y":195.0,"alias":"view_convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"convert_info_not_identifited_records":{"tableName":"convert_info_not_identifited_records","schemaName":"metrics","x":334.0,"y":196.0,"alias":"convert_info_not_identifited_records","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"convert_info_not_identifited_records","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"convert_info_not_identifited_records","entity":"convert_info_not_identifited_records","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"view_convert_info_not_identifited_records","refToEntityName":"convert_info_not_identifited_records","refToColumns":[{"schema":"metrics","table":"convert_info_not_identifited_records","entity":"convert_info_not_identifited_records","name":"convert_info_not_identifited_records_id"}],"refOnColumns":[{"schema":"metrics","table":"view_convert_info_not_identifited_records","entity":"view_convert_info_not_identifited_records","name":"convert_info_not_identifited_records_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0} + + + + +DefaultLoadDao +database.dao + + + + + valueColumn + + {"schema":"metrics","table":"view_convert_info_not_identifited_records","entity":"view_convert_info_not_identifited_records","name":"count_all"} + + + + + DefaultRoundLabelConfiguration + ervu_business_metrics.component.chart.label + + + + + + @@ -3239,6 +3347,18 @@ true + + noDataFont + + "15px Arial" + + + + visible + + true + + @@ -3255,7 +3375,6 @@ ervu_business_metrics.component.filter true - true references @@ -3307,7 +3426,6 @@ ervu_business_metrics.component.filter true - true filterComponents @@ -3333,6 +3451,20 @@ + + + + RoundSingleChartDataSetService + ervu_business_metrics.component.chart + + + + dataSetConfigurations + + + + + @@ -3381,6 +3513,40 @@ null + + textFormatter + + + + replaceModels + + + + + + value + + "null" + + + + valueToReplace + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu_business_metrics.formatter + + + @@ -5859,7 +6025,6 @@ ea4d0df5-9e4f-48b2-bf91-3a72d3a90640 ГК третий ряд показателей true - false false @@ -7987,6 +8152,7 @@ ervu_business_metrics.component.chart true + true bars @@ -8134,7 +8300,6 @@ a7b44f97-c49f-4356-b45d-64c4d6e71f8b ВК Результат сопоставления csv и xml файлов true - false false @@ -9162,28 +9327,6 @@ - - - BarDataLabelChartPlugin - ervu_business_metrics.component.chart.plugin - - true - true - - - color - - "#B3B3B3FF" - - - - useStaticColor - - true - - - - FilterGroupDelegate diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page index e41e59c..8fc7900 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page @@ -1477,7 +1477,6 @@ 7b47ba81-1c81-4780-b0f6-7fe726e099a7 Постановка в 17 лет true - false false @@ -1498,7 +1497,6 @@ 44fcde44-f00c-4320-9a6e-f730b0e0fd65 Hbox17 true - false false @@ -1507,7 +1505,7 @@ - null + "pull-center" @@ -1518,6 +1516,82 @@ + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 4f6cfc3f-9d19-4238-b13a-61444afcdbd6 + AC_0 + false + false + + + + eventRefs + + + + + + behavior + +{"objectId":"00a72a76-3da4-4f9c-819f-f019eef5818a","packageName":"component.container","className":"VBox","type":"TS"} + + + + propertyName + +"beforeStart" + + + + + + + + + ifCondition + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"53fe8995-85ce-4067-982f-e67603e217ee","packageName":"component.button","className":"Button","type":"TS"} + + + + method + +"onClick" + + + + value + +null + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e 60b1bcbe-1dfc-40d2-814a-f177831e493b @@ -1776,6 +1850,7 @@ + @@ -14326,7 +14401,6 @@ 8ce33491-362c-4be8-b964-2abec01f4e30 Постановка в 18 лет и старше true - false false @@ -14347,7 +14421,6 @@ 8510221a-dfcf-4645-b1c5-9eaed32b32c9 Hbox18 true - false false @@ -14356,7 +14429,7 @@ - null + "pull-center" @@ -14367,6 +14440,82 @@ + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 5d4a4366-273d-43e9-bc16-ad31cd43b51c + AC_0 + false + false + + + + eventRefs + + + + + + behavior + +{"objectId":"00a72a76-3da4-4f9c-819f-f019eef5818a","packageName":"component.container","className":"VBox","type":"TS"} + + + + propertyName + +"beforeStart" + + + + + + + + + ifCondition + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + +{"objectId":"96b92d36-05c5-4368-bb0e-120c23f5c01c","packageName":"component.button","className":"Button","type":"TS"} + + + + method + +"onClick" + + + + value + +null + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e e985f9b5-11ca-42c7-a647-01a8520bc0af