diff --git a/apps/mina-sidor-fa/src/app/app-routing.module.ts b/apps/mina-sidor-fa/src/app/app-routing.module.ts index 061437f..fdeed98 100644 --- a/apps/mina-sidor-fa/src/app/app-routing.module.ts +++ b/apps/mina-sidor-fa/src/app/app-routing.module.ts @@ -23,8 +23,8 @@ const routes: Routes = [ canActivate: [AuthGuard], }, { - path: 'avrop', - data: { title: 'Avrop' }, + path: 'nya-deltagare', + data: { title: 'Nya deltagare' }, loadChildren: () => import('./pages/avrop/avrop.module').then(m => m.AvropModule), canActivate: [AuthGuard], }, diff --git a/apps/mina-sidor-fa/src/app/pages/start/start.component.html b/apps/mina-sidor-fa/src/app/pages/start/start.component.html index 4cca173..b3fdacc 100644 --- a/apps/mina-sidor-fa/src/app/pages/start/start.component.html +++ b/apps/mina-sidor-fa/src/app/pages/start/start.component.html @@ -6,21 +6,21 @@
- +

Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också i vänster menyn på sidan

- +
- +

Large alert! Check the knobs section and play around!

- +

Dina skickade tilldelningar har nått fram till handledare som godkänt och arbetat vidare med deltagarna

diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/components/sidebar/sidebar.component.html b/apps/mina-sidor-fa/src/app/shared/components/layout/components/sidebar/sidebar.component.html index 6bfbbd1..f9f9ebf 100644 --- a/apps/mina-sidor-fa/src/app/shared/components/layout/components/sidebar/sidebar.component.html +++ b/apps/mina-sidor-fa/src/app/shared/components/layout/components/sidebar/sidebar.component.html @@ -12,21 +12,15 @@ - diff --git a/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts b/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts index a3f4605..78cea13 100644 --- a/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts +++ b/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts @@ -1,8 +1,9 @@ export const NAVIGATION = { administration: 'Administration', personal: 'Hantera personal', + 'redigera-konto': 'Redigera personal', deltagare: 'Deltagare', - avrop: 'Avrop', + 'nya-deltagare': 'Nya deltagare', 'planera-aktiviteter': 'Planera aktiviteter', 'mitt-konto': 'Mitt konto', 'bjuda-in': 'Bjuda in personal', diff --git a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts index b6bc69f..6a78bde 100644 --- a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts +++ b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts @@ -15,9 +15,15 @@ export function mapPathsToBreadcrumbs( if (isEmployeeCardRoute(paths)) { breadcrumbs[breadcrumbs.length - 1].text = 'Personal information'; + } else if (isEmployeeEditRoute(paths)) { + breadcrumbs[breadcrumbs.length - 2] = { + text: 'Hantera personal', + routerLink: '/administration/personal', + }; + breadcrumbs[breadcrumbs.length - 1].text = 'Redigera konto'; } else if (isParticipantCardRoute(paths)) { breadcrumbs[breadcrumbs.length - 1].text = 'Deltagarinformation'; - } + } return breadcrumbs; } @@ -25,6 +31,10 @@ function isEmployeeCardRoute(paths: string[]): boolean { return paths.length === 3 && paths[1] === 'personal'; } +function isEmployeeEditRoute(paths: string[]): boolean { + return paths.length === 3 && paths[1] === 'redigera-konto'; +} + function isParticipantCardRoute(paths: string[]): boolean { return paths.length === 2 && paths[0] === 'deltagare'; }