diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/appeals.page b/resources/src/main/resources/business-model/ervu-business-metrics/appeals.page index 8bdc2b6..46dac1f 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/appeals.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/appeals.page @@ -2342,7 +2342,6 @@ b3bfb047-b436-4db7-a676-5bef32bdad08 ВК Принятые обращения граждан true - false false @@ -2551,105 +2550,7 @@ c5c2a064-40fb-42e4-8f58-5d8644c8c085 ГК Показатель true - false - false - - - - cssClasses - - - - - - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - ebb8731c-f7c1-40a1-9d40-a331e450a6ee - 7 000 - false - false - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"} - - - - - -false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c4943a79-1baa-4378-9a6d-bfb1521fee13 - принято на рассмотреное, в т.ч.: - false - false - - - - cssClasses - - - - "section-header" - - - - - - initialValue - - "принято на рассмотреное, в т.ч.:" - - - - label - - null - - - - - - - - -false - - + true d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -2675,11 +2576,51 @@ Вертикальный контейнер true false - + + + + cssClasses + + + + "graph-row-left" + + + + + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +8402b9d1-ddc0-44cb-8de9-9c2b435c7a28 +Текст +false +false + + + + cssClasses + + + + "graph-text-hidden" + + + + + + + + + + + false + + 85eb12aa-f878-4e29-b109-9d31af0fefb4 0fe10cff-66c2-4e87-9199-f3b58bb407d1 @@ -3118,13 +3059,20 @@ eac8fba9-50a6-40b6-9578-945c9c2e9d1f Горизонтальный контейнер true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8d66019b-b1f8-41bd-8725-d9f3767130f7 + Вертикальный контейнер + true false cssClasses - + "graph-legend-right" @@ -3133,602 +3081,14 @@ - - - - - -9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 -ddc6a812-279e-4c8b-9829-e94f94b06373 -ВК % -true -false -false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 030dcad1-c219-4363-800b-6fe324d5dc21 - 71% - false - false - - - - cssClasses - - - - "text-invert" - - - - - - initialValue - - null - - - - textFormatter - - - - unitsLabel - -"%" - - - - unitsText - -{"objectId":"030dcad1-c219-4363-800b-6fe324d5dc21","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_satisfided"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_satisfided"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 355a1f5f-f351-4077-ab1a-44a3835a9229 - 29% - false - false - - - - cssClasses - - - - "text-invert" - - - - - - initialValue - - null - - - - textFormatter - - - - replaceModels - - - - - - unitsLabel - -"%" - - - - unitsText - -{"objectId":"355a1f5f-f351-4077-ab1a-44a3835a9229","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_not_satisfided"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_not_satisfided"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 545fd292-c695-4f85-abaa-9a32703d5bb5 - 57% - false - false - - - - cssClasses - - - - "text-invert" - - - - - - initialValue - - null - - - - textFormatter - - - - unitsLabel - -"%" - - - - unitsText - -{"objectId":"545fd292-c695-4f85-abaa-9a32703d5bb5","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_on_time"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_on_time"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 2fabb9ce-5e1a-4d74-bf45-d0bd9ba54cbf - 29% - false - false - - - - cssClasses - - - - "text-invert" - - - - - - initialValue - - null - - - - textFormatter - - - - unitsLabel - -"%" - - - - unitsText - -{"objectId":"2fabb9ce-5e1a-4d74-bf45-d0bd9ba54cbf","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_expired"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_expired"} - - - - - - false - - - - -9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 -7989b38e-af82-4f05-96fe-15af5cace7a0 -ВК значение -true -false -false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 4dbe471c-e8ed-4164-a323-0a9a587a4ad0 - 5 000 - false - false - - - - initialValue - - null - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_satisfided"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_satisfided"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 87276707-df4d-44bc-9ff7-fc6d13a92998 - 2 000 - false - false - - - - initialValue - - null - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_not_satisfided"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_not_satisfided"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 1dad7c35-42e7-4e02-af2f-68c7cbc62ab4 - 4 000 - false - false - - - - initialValue - - null - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_on_time"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_on_time"} - - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 9ac7dfa1-d6ed-41f0-9344-9050edf03f95 - 2 000 - false - false - - - - initialValue - - null - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_expired"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_expired"} - - - - - - false - - - - -9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 -e24485d0-aa06-4160-b24d-c783cb035bdd -ВК текст + + + + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +c5c2a064-40fb-42e4-8f58-5d8644c8c085 +ГК Показатель true false false @@ -3737,135 +3097,875 @@ cssClasses - - - "text-wrap" - - + - - - - - + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 - d8433f1c-7e47-4b44-a82d-2cf49de8d9d3 - Удовлетворенных + ebb8731c-f7c1-40a1-9d40-a331e450a6ee + 7 000 false false - + + + - initialValue + defaultValueColumn - "Удовлетворенных" + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"} - label + loadType - null + "BY_COLUMN" - - - - - false - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 5496edb8-2a40-46f4-ae1d-de1aaa40d720 - Не удовлетворенных - false - false - + - initialValue + loadType - "Не удовлетворенных" + "BY_COLUMN" - label + valueByEventColumn - null + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"} - - - false - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - d52aa054-80e6-4b72-857f-c618983c7665 - Принято в срок + c4943a79-1baa-4378-9a6d-bfb1521fee13 + принято на рассмотреное, в т.ч.: false + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 85fd3b99-59b6-494a-8294-4fd25e0a6ae6 + Вертикальный контейнер + true + false + + + + cssClasses + + + + "text-wrap" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c4943a79-1baa-4378-9a6d-bfb1521fee13 + принято на рассмотреное, в т.ч.: + false + false + + + + cssClasses + + + + + + initialValue + + "принято на рассмотреное, в т.ч.:" + + + + label + + null + + + + + + + + + false + + + + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +eac8fba9-50a6-40b6-9578-945c9c2e9d1f +Горизонтальный контейнер +true +false + + + + cssClasses + + + + + + + + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + ddc6a812-279e-4c8b-9829-e94f94b06373 + ВК % + true false false - - - - initialValue - - "Принято в срок" - - - - label - - null - - - - - - - - - false - + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 030dcad1-c219-4363-800b-6fe324d5dc21 + 71% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"030dcad1-c219-4363-800b-6fe324d5dc21","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_satisfided"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_satisfided"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 355a1f5f-f351-4077-ab1a-44a3835a9229 + 29% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + textFormatter + + + +replaceModels + + + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"355a1f5f-f351-4077-ab1a-44a3835a9229","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_not_satisfided"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_not_satisfided"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 545fd292-c695-4f85-abaa-9a32703d5bb5 + 57% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"545fd292-c695-4f85-abaa-9a32703d5bb5","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_on_time"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_on_time"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 2fabb9ce-5e1a-4d74-bf45-d0bd9ba54cbf + 29% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"2fabb9ce-5e1a-4d74-bf45-d0bd9ba54cbf","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_expired"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"percent_accepted_expired"} + + + + + + false + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 112042e8-5f5f-4428-9e06-42ee37b54deb - Просрочено - false + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 7989b38e-af82-4f05-96fe-15af5cace7a0 + ВК значение + true false - + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 4dbe471c-e8ed-4164-a323-0a9a587a4ad0 + 5 000 + false + false + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_satisfided"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_satisfided"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 87276707-df4d-44bc-9ff7-fc6d13a92998 + 2 000 + false + false + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_not_satisfided"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_not_satisfided"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 1dad7c35-42e7-4e02-af2f-68c7cbc62ab4 + 4 000 + false + false + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_on_time"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_on_time"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9ac7dfa1-d6ed-41f0-9344-9050edf03f95 + 2 000 + false + false + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_expired"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"citizen_appeals","entity":"citizen_appeals","name":"count_accepted_expired"} + + + + + + false + + + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + e24485d0-aa06-4160-b24d-c783cb035bdd + ВК текст + true + false + - initialValue + cssClasses - "Просрочено" - - - - label - - null + + + "text-wrap" + + - - - - - false - + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d8433f1c-7e47-4b44-a82d-2cf49de8d9d3 + Удовлетворенных + false + false + + + + initialValue + + "Удовлетворенных" + + + + label + + null + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 5496edb8-2a40-46f4-ae1d-de1aaa40d720 + Не удовлетворенных + false + false + + + + initialValue + + "Не удовлетворенных" + + + + label + + null + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d52aa054-80e6-4b72-857f-c618983c7665 + Принято в срок + false + false + false + + + + initialValue + + "Принято в срок" + + + + label + + null + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 112042e8-5f5f-4428-9e06-42ee37b54deb + Просрочено + false + false + + + + initialValue + + "Просрочено" + + + + label + + null + + + + + + + + + false + + @@ -3898,7 +3998,6 @@ a7e60d27-aaf5-4845-8119-5699dacd7232 ГК Второй ряд true - false false 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 1457c62..501b844 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 @@ -4193,6 +4193,7 @@ 3447ab1c-24c9-435a-9e23-1e0ab39404ab ГК второй ряд показателей true + false false @@ -6456,7 +6457,6 @@ ea4d0df5-9e4f-48b2-bf91-3a72d3a90640 ГК третий ряд показателей true - false false @@ -6738,6 +6738,16 @@ false + + cssClasses + + + + "graph-row-left" + + + + style 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 c1f72d9..b7866e5 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 @@ -2470,6 +2470,7 @@ 201e300c-2785-4181-ac47-a98d0e0de4ce ВК ГИР ВУ true + false false @@ -2519,7 +2520,6 @@ 084c5f24-cf36-4796-945d-c2367e1a260a Vbox_50% true -false false @@ -2780,6 +2780,12 @@ null + + label + + "2400" + + @@ -2929,6 +2935,12 @@ null + + label + +"1450" + + @@ -3080,6 +3092,12 @@ null + + label + +"670" + + @@ -4827,6 +4845,7 @@ 1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37 ГК Второй ряд true + false false @@ -7048,7 +7067,6 @@ 482b189e-cdd8-411e-be62-b9e9e2a92c1f ВК ЕПГУ true - false false @@ -7069,6 +7087,7 @@ c0d0788b-b8a1-4af0-be0f-577b16592e00 ГК Первый ряд true + false false @@ -9597,6 +9616,7 @@ 573b1036-01ae-4575-8ba1-142280e58adf Вертикальный контейнер true +false false @@ -12610,6 +12630,7 @@ 8bdb833c-9ed1-473e-8023-e4694a3b47c9 ГК Второй ряд true + false false @@ -13861,7 +13882,6 @@ 2473aa4c-ca4a-429d-82eb-8913a811e25e ВК Плашка true -false false @@ -14179,6 +14199,7 @@ 4f2a680c-d1c4-4326-94fd-d48145a2e8af ГК Третий ряд true + false false @@ -22160,6 +22181,7 @@ 8ce33491-362c-4be8-b964-2abec01f4e30 Постановка в 18 лет и старше true + false false @@ -29000,7 +29022,6 @@ 62e2055e-ccf0-4878-9420-5aa4c2cd0a0c ВК ЕПГУ true - false false