Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/shared/chat/group-messages/group-messages.page.scss

@@ -12,8 +12,7 @@
         //transform: translate3d(0, 1px, 0);
         
         .header-top{
-          //width: 360px;
-          margin: 0px auto;
+          width: 100%;
           overflow: auto;
           padding: 0 !important;
           background: #fff;

src/app/shared/chat/new-group/contacts/contacts.page.scss

@@ -27,7 +27,6 @@
       padding-left: 20px;
     }
       .title-content{
-        width: 360px;
         margin: 0px auto;
         overflow: auto;
         padding: 0 !important;

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -1,13 +1,16 @@
-<ion-header class="ion-no-border1">
+<ion-header class="ion-no-border">
   <div class="main-header">
-    <div class="thetitle"><ion-label >Despachos Presidenciais</ion-label></div>
+    <div class="thetitle">
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
+    </div>
     <div class="theicon">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
   </div>
-  <div class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
+  <div *ngIf="loggeduser.Profile =='MDGPR'" class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">

src/app/shared/gabinete-digital/expediente/expediente.page.scss

@@ -16,7 +16,6 @@
         transform: translate3d(0, 1px, 0);
         
         .header-top{
-          width: 360px;
           margin: 0px auto;
           overflow: auto;
           padding: 0 !important;

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -7,7 +7,7 @@
       </button>
     </div>
   </div>
-  <ion-toolbar>
+  <ion-toolbar *ngIf="loggeduser.Profile == 'MDGPR'">
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="expedientes">
         Expediente

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<any> = new EventEmitter<any>();
 
@@ -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() {

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
     <div class="theicon">

src/app/shared/gabinete-digital/pendentes/pendentes.page.html

@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
     <div class="theicon">

src/app/shared/headers/header-no-search/profile/profile.component.html

@@ -24,8 +24,8 @@
     
         <div class="profile-info">
             <div class="label-text">Dados Perfil</div>
-            <div class="user-role">Ministro e Director do Gabinete do Presidente da Rep.</div>
-            <div class="email">email@exemple.ao</div>
+            <div class="user-role">{{loggeduser.RoleDescription}}</div>
+            <div class="email">{{loggeduser.Email}}</div>
         </div>
 
 

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() {}