diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6536aab4b..1aba1f65d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -74,7 +74,8 @@
-

Expediente Presidente

+

Expediente Presidente

+

Expediente

- Documentos

@@ -93,7 +94,8 @@
-

Expediente Presidente

+

Expediente Presidente

+

Expediente

- Documentos

diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 4b7190d65..d02769421 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -7,7 +7,7 @@ - + Expediente diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 21e5f15e6..0ea5b16bb 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -9,6 +9,8 @@ import { LoadingService } from 'src/app/services/loading.service'; import { ModalController, NavParams } from '@ionic/angular'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-expedientes-pr', @@ -24,6 +26,8 @@ export class ExpedientesPrPage implements OnInit { taskslist:DailyWorkTask[]; serialNumber:string; + loggeduser: User; + @Input() profile:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -31,8 +35,10 @@ export class ExpedientesPrPage implements OnInit { private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, + private authService: AuthService, ) { this.profile = 'mdgpr'; + this.loggeduser = authService.ValidatedUser; } ngOnInit() { diff --git a/src/app/shared/headers/header-no-search/profile/profile.component.html b/src/app/shared/headers/header-no-search/profile/profile.component.html index 883feecf4..68d4c6269 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.component.html +++ b/src/app/shared/headers/header-no-search/profile/profile.component.html @@ -24,8 +24,8 @@
Dados Perfil
-
Ministro e Director do Gabinete do Presidente da Rep.
- +
{{loggeduser.RoleDescription}}
+
diff --git a/src/app/shared/headers/header-no-search/profile/profile.component.ts b/src/app/shared/headers/header-no-search/profile/profile.component.ts index 167fba49a..f9a966148 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.component.ts +++ b/src/app/shared/headers/header-no-search/profile/profile.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-profile', @@ -8,7 +10,14 @@ import { ModalController } from '@ionic/angular'; }) export class ProfileComponent implements OnInit { - constructor(private modalController:ModalController) { } + loggeduser: User; + + constructor(private modalController:ModalController, + private authService: AuthService) { + this.loggeduser = authService.ValidatedUser; + + console.log(this.loggeduser.RoleDescription) + } ngOnInit() {}