micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets

Browse source 
# Conflicts:
#	resources/src/main/resources/business-model/ervu-business-metrics/conversion.page
This commit is contained in:
Фоат Саляхов 2024-11-07 09:38:26 +03:00
commit c5dd448921
2 changed files with 1 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/ts/modules/app/app-routing.module.ts
View file

@ -4,55 +4,10 @@ import {ConfirmExitGuard} from "@webbpm/base-package";
import {RolesGuard} from "./guard/RolesGuard";
const appRoutes: Routes = [
{
path: 'milregistration',
loadChildren: 'generated-sources/page-milregistration.module#PagemilregistrationModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'conversion',
loadChildren: 'generated-sources/page-conversion.module#PageconversionModule',
canActivate: [ConfirmExitGuard],
},
{
path: 'appeals',
loadChildren: 'generated-sources/page-appeals.module#PageappealsModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'ratings',
loadChildren: 'generated-sources/page-ratings.module#PageratingsModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'recruitment',
loadChildren: 'generated-sources/page-recruitment.module#PagerecruitmentModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'notregistered',
loadChildren: 'generated-sources/page-notregistered.module#PagenotregisteredModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'citizen',
loadChildren: 'generated-sources/page-citizen.module#PagecitizenModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'citizencard/:id',
loadChildren: 'generated-sources/page-citizencard.module#PagecitizencardModule',
canActivate: [ConfirmExitGuard, RolesGuard],
},
{
path: 'main',
loadChildren: 'generated-sources/page-main.module#PagemainModule',
canActivate: [ConfirmExitGuard, RolesGuard]
},
{
path: 'total_registered_second',
loadChildren: 'generated-sources/page-total_registered_second.module#Pagetotal_registered_secondModule',
canActivate: [ConfirmExitGuard, RolesGuard]
}
];

2
frontend/src/ts/modules/webbpm/webbpm-routing.module.ts
View file

@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
},
{
path: '',
loadChildren: 'generated-sources/page-main.module#PagemainModule',
loadChildren: 'generated-sources/page-conversion.module#PageconversionModule',
canActivate: [ConfirmExitGuard, RolesGuard],
pathMatch: 'full',
},