diff --git a/frontend/package.json b/frontend/package.json index 4479bde..8385e86 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -57,7 +57,7 @@ "reflect-metadata": "0.1.13", "rxjs": "6.4.0", "rxjs-compat": "6.4.0", - "selectize": "0.12.4-cg.10", + "selectize": "0.12.4-cg.11", "systemjs": "0.21.4", "systemjs-plugin-babel": "0.0.25", "tslib": "1.9.3", diff --git a/frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts b/frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts index f3b088a..adc8ff8 100644 --- a/frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts +++ b/frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts @@ -15,10 +15,9 @@ const webbpmRoutes: Routes = [ }, { path: '', - loadChildren: 'generated-sources/page-main.module#PagemainModule', + loadChildren: 'generated-sources/page-conversion.module#PageconversionModule', canActivate: [ConfirmExitGuard, RolesGuard], pathMatch: 'full', - }, { path: '**', 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 9345917..08be118 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 @@ 6da727be-fd60-46b7-8636-ebdb5fea9fa1 ГК Выпадающие списки true + false false @@ -42,7 +43,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"0\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":433.0,"y":222.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -66,13 +67,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 138a1102-f344-4356-8603-d0e06bd833e8 - Выпадающий список РФ, уровни - false - true - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 32c1ef3d-c802-4fff-99f4-f6a59c6902aa @@ -81,6 +75,12 @@ false + + collectible + +false + + placeholder @@ -104,24 +104,7 @@ columnSorts - - - - - field - -{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"} - - - - sortOrder - -"ASC" - - - - - + @@ -148,13 +131,15 @@ - + + false + defaultValueColumn -{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"} +{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"shortname"} @@ -163,6 +148,15 @@ "BY_COLUMN" + + service + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + @@ -192,6 +186,85 @@ + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 4a5f97a4-67fb-4790-b015-222d69f08ea7 + Дата + false + false + false + + + + cssClasses + + + + "pull-right" + + + + + + placeholder + +"Дата" + + + + + + + + comboBoxService + + + + displayColumn + + {"schema":"metrics","table":"recruitment","entity":"recruitment","name":"ts"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":337.0,"y":142.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":337.0,"y":142.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":337.0,"y":142.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + + + defaultValueColumn + +{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"ts"} + + + + loadType + +"BY_COLUMN" + + + + + + + false + + be0e38c3-01c2-4122-85dd-1b6e176f543d f799483f-b32d-4131-8fd7-1672d422d063 @@ -233,6 +306,7 @@ 66b71717-556b-4b2f-bba7-c059a9bc8083 ГК Первый ряд главного меню true + false false @@ -276,8 +350,10 @@ ccc90718-2324-443e-9173-5a39b661e843 Конвертация false + false false + false caption @@ -316,6 +392,33 @@ + + + StaticRouteNavigationButton + modules.user-management.component + + true + + + caption + +"Конвертация" + + + + route + +"back" + + + + visible + +true + + + + fd7e47b9-dce1-4d14-9f3a-580c79f59579 @@ -353,6 +456,13 @@ + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 567a5cad-2ecd-4be9-b73d-747e1a631e42 + Выпадающий список + false + true + fd7e47b9-dce1-4d14-9f3a-580c79f59579 0a7808fc-a827-4a54-8bd5-4985cdb43820 @@ -835,6 +945,7 @@ c5f81ae5-a5d3-4da6-85a8-dc5780a5eac8 ГК Первый ряд показателей true + false false @@ -1035,7 +1146,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":515.0,"y":306.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"convert_info_records_from_easu_id"},"operation":"EQUAL","typeCode":"CONST","values":["2"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":515.0,"y":306.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"convert_info_records_from_easu_id"},"operation":"EQUAL","typeCode":"CONST","values":["2"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"convert_info_records_from_easu":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":515.0,"y":306.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"convert_info_records_from_easu_id"},"operation":"EQUAL","typeCode":"CONST","values":["2"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":374.0,"y":149.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":195.0,"y":252.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":374.0,"y":149.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":195.0,"y":252.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"convert_info_records_from_easu":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":374.0,"y":149.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":195.0,"y":252.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"convert_info_records_from_easu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} @@ -1135,7 +1246,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"convert_info_records_from_easu":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":163.0,"y":324.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":163.0,"y":324.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"convert_info_records_from_easu":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":337.0,"y":181.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":163.0,"y":324.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"convert_info_records_from_easu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} @@ -1175,9 +1286,7 @@ false false - -true - + @@ -1213,6 +1322,12 @@ + + borderWidth + + null + + columnAggregationDataSet @@ -1262,6 +1377,12 @@ + + cutout + + "70%" + + datasetType @@ -1285,6 +1406,12 @@ + + radius + + "80%" + + @@ -1343,7 +1470,7 @@ cutout - "70%" + "60%" @@ -1372,7 +1499,7 @@ radius - "80%" + "70%" @@ -1403,6 +1530,19 @@ true true + + legend + + + + display + + false + + + + + visible @@ -1699,6 +1839,13 @@ + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 567a5cad-2ecd-4be9-b73d-747e1a631e42 + Выпадающий список + false + true + ba24d307-0b91-4299-ba82-9d0b52384ff2 385f8ca1-5197-4cc7-a58b-b46e77510793 @@ -2794,7 +2941,6 @@ 32dd7c25-e11c-4f81-98ac-cfd772538e55 ГК второй ряд показателей true - false false @@ -2888,7 +3034,6 @@ 034b5eb7-6cd7-47e0-bc38-c43973aeffac ГК Заголовок true - false false @@ -3390,7 +3535,6 @@ 9113116e-f11b-418b-bf47-ff4c56e93ecd ВК Результаты конвертации true - false false @@ -3513,6 +3657,7 @@ 35040ac0-0b14-46dd-888b-266d98fe6a49 ГК График и показатели true + false false @@ -4101,7 +4246,6 @@ 3c3e4063-7498-41ed-9bd0-80c4a5dd41c1 ГК третий ряд показателей true - false false @@ -4122,7 +4266,7 @@ width - "50%" + null @@ -4134,18 +4278,12 @@ - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - 49f6d523-ee2e-419b-acff-901c76a6479a - ВК Загрузка записей в ГИС ЕРВУ - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 7e582bb2-2ab9-4768-b2a8-19ae63b66e77 ВК Отправка уведомлений в ЛК гражданина на ЕПГУ true + false false @@ -4225,7 +4363,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 67889e26-449a-48a0-a444-32d7340b2ac6 - ВК Отправка уведомлений в ЛК гражданина на ЕПГУ + Отправка уведомлений в ЛК гражданина на ЕПГУ false false @@ -4243,7 +4381,7 @@ label - "ВК Отправка уведомлений в ЛК гражданина на ЕПГУ" + "Отправка уведомлений в ЛК гражданина на ЕПГУ" @@ -4268,6 +4406,7 @@ 6a0b2168-a510-43af-85b0-93ad470b1038 ГК График и показатели true + false false @@ -4279,6 +4418,7 @@ dcbf1f28-8a7c-490d-b9bf-46141112f64c ВК Показатели true + false false @@ -4919,6 +5059,7 @@ c26ec47a-4a66-4660-b6a4-afb54fba8ac0 ВК График true + false false @@ -5180,6 +5321,368 @@ + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + f0529120-ebbc-4ef9-a6ed-5de31a5ac088 + ВК Результат сопоставления csv и xml файлов + true + false + + + +cssClasses + + + + "block-section" + + + + + +style + + + + width + + "50%" + + + + + + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + fdae52c4-ee9e-4256-ac25-da646d12dd58 + ГК Заголовок + true + false + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 8c345f94-20bf-4d3e-80cb-4ca5204e73f3 + Результат сопоставления csv и xml файлов + false + false + + + + cssClasses + + + + "section-header" + + + + + + label + + "Результат сопоставления csv и xml файлов" + + + + + + + + +false + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 1cdf8420-5e39-417c-8b09-c75de6c517a2 + ГК График и показатели + true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8a6c6a74-357b-4f6e-bda5-929115da08c2 + ВК График и показатели + true + false + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 7d5d9210-c6af-4d95-8ee8-6e752de7119c + ГК График + true + false + false + + + + + + +85eb12aa-f878-4e29-b109-9d31af0fefb4 +3588e7a4-8815-462a-99d6-afbb9b2f0af8 +ChartV2 +true +false + + + false + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + c3010d3d-5953-485a-ab43-cd3f6e676305 + ГК Показатели + true + false + false + + + + + + +9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 +08883241-731e-45c6-a98d-629b2885e581 +ВК +true +false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9597603c-2277-417c-8b64-1f8f9b0ee8ed + csv + false + false + + + + label + + "csv" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 4f0fd93c-5e41-43d2-9668-5aad4a8ed92e + ГК Показатели + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 55bb65a4-4fc4-44c3-a928-9f73040e5d02 + 80 000 + false + false + + + + initialValue + + "80 000" + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + cd2ddbfe-175d-491e-8673-fdf6c79bd80f + Записей + false + false + + + + initialValue + + "записей" + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d8dd34e1-4ec4-4851-8b94-5e62f7cd19fe + (80%) + false + false + + + + initialValue + + "(80%)" + + + + + + + + + false + + + + + +9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 +a8aa7498-bb7e-490d-b8e0-0ad68beb0619 +ВК +true +false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 349874dc-01a3-4c53-8172-8dd13f42de19 + xml + false + false + + + + label + + "xml" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + ca40e2b2-703b-446d-ac3b-0992d61bb2c5 + ГК Показатели + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 39f81534-22a1-4010-b99b-6bc7bd2c3835 + 100 000 + false + false + + + + initialValue + + "100 000" + + + + label + + null + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9f19f6b8-324d-4557-84f8-3c3e98621814 + Записей + false + false + + + + initialValue + + "записей" + + + + + + + + + false + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 7d5d9210-c6af-4d95-8ee8-6e752de7119c + Горизонтальный контейнер + true + true + + ba24d307-0b91-4299-ba82-9d0b52384ff2