From fee5aada1a2c582ad187eeba6af711a9e76e6115 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 11:57:16 +0100
Subject: [PATCH 1/9] Improve chat responsiveness

---
 src/app/pages/chat/chat.page.ts                 | 17 +++--------------
 .../group-messages/group-messages.page.scss     |  4 +---
 .../group-messages/group-messages.page.scss     |  3 +--
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index b71e1fa79..52d11878d 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -327,17 +327,11 @@ sendMsg() {
   async openMessagesModal(roomId:any){
     this.closeAllDesktopComponents();
 
-    let classs;
-    if( window.innerWidth <= 1024){
-      classs = 'modal'
-    } else  {
-      classs = 'chat-mobile-modal-to-Desktop'
-    }
     console.log(roomId);
     
     const modal = await this.modalController.create({
       component: MessagesPage,
-      cssClass: classs,
+      cssClass: 'modal modal-desktop',
       componentProps: {
         roomId: roomId,
       },
@@ -347,17 +341,12 @@ sendMsg() {
   }
 
   async openGroupMessagesModal(roomId:any){
-    let classs;
-    if( window.innerWidth <= 1024){
-      classs = 'modal'
-    } else  {
-      classs = 'chat-mobile-modal-to-Desktop'
-    }
+
     console.log(roomId);
     
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
-      cssClass: classs,
+      cssClass: 'modal modal-desktop',
       componentProps: {
         roomId: roomId,
       },
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index f94b3c8e6..4d9f6849f 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -16,8 +16,6 @@
         transform: translate3d(0, 1px, 0);
         
         .header-top{
-          width: 360px;
-          margin: 0px auto;
           overflow: auto;
           padding: 0 !important;
           background: #fff;
@@ -36,7 +34,7 @@
           }
         }
         .header-bottom{
-          width: 310px;
+          padding-left: 10px;
           overflow: auto;
           margin: 0 auto;
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index 1d3a14713..77fcebb70 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/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;

From 70cf1d56d190a63d98518a53b907ea8304a04643 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 12:03:50 +0100
Subject: [PATCH 2/9] Improve chat

---
 src/app/pages/chat/chat.page.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 52d11878d..2a9b58dd0 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -294,7 +294,7 @@ sendMsg() {
   async selectContact(){
     const modal = await this.modalController.create({
       component: ContactsPage,
-      cssClass: 'contacts',
+      cssClass: 'modal modal-desktop',
     });
     await modal.present();
     modal.onDidDismiss();
@@ -303,7 +303,7 @@ sendMsg() {
   async newGroup(){
     const modal = await this.modalController.create({
       component: NewGroupPage,
-      cssClass: 'new-group',
+      cssClass: 'modal modal-desktop',
     });
     await modal.present();
     modal.onDidDismiss();
@@ -312,7 +312,7 @@ sendMsg() {
   async editGroup(roomId){
     const modal = await this.modalController.create({
       component: EditGroupPage,
-      cssClass: 'edit-group',
+      cssClass: 'modal modal-desktop',
       componentProps: {
         roomId: roomId,
       },

From 24ecccd136f697224e59afb3cdfe5ce74ac760e4 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 12:09:46 +0100
Subject: [PATCH 3/9] Improve reponsiveness

---
 .../chat/group-messages/group-contacts/group-contacts.page.scss  | 1 -
 src/app/pages/chat/messages/contacts/contacts.page.scss          | 1 -
 src/app/pages/chat/messages/messages.page.scss                   | 1 -
 src/app/pages/chat/new-group/contacts/contacts.page.scss         | 1 -
 src/app/pages/chat/new-group/new-group.page.scss                 | 1 -
 src/app/pages/chat/newchat/newchat.page.scss                     | 1 -
 src/app/pages/events/event-detail/event-detail.page.scss         | 1 -
 .../pages/gabinete-digital/despachos/despacho/despacho.page.scss | 1 -
 .../pages/gabinete-digital/diplomas/diploma/diploma.page.scss    | 1 -
 src/app/pages/publications/gallery/gallery.page.scss             | 1 -
 src/app/shared/chat/new-group/contacts/contacts.page.scss        | 1 -
 src/app/shared/gabinete-digital/expediente/expediente.page.scss  | 1 -
 12 files changed, 12 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
index 7879b0cae..70b621dbb 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
@@ -26,7 +26,6 @@
        padding-left: 20px;
      }
        .title-content{
-         width: 360px;
          margin: 0px auto;
          overflow: auto;
          padding: 0 !important;
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.scss b/src/app/pages/chat/messages/contacts/contacts.page.scss
index 1eb104bdb..a50120cba 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.scss
+++ b/src/app/pages/chat/messages/contacts/contacts.page.scss
@@ -27,7 +27,6 @@
        padding-left: 20px;
      }
        .title-content{
-         width: 360px;
          margin: 0px auto;
          overflow: auto;
          padding: 0 !important;
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index 1a67bbcda..496cd70a0 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -16,7 +16,6 @@
         transform: translate3d(0, 1px, 0);
         
         .header-top{
-          width: 360px;
           margin: 0px auto;
           overflow: auto;
           padding: 0 !important;
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/pages/chat/new-group/contacts/contacts.page.scss
index c97008f82..54523dbf8 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.scss
+++ b/src/app/pages/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;
diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss
index 428f62e08..1ca97f556 100644
--- a/src/app/pages/chat/new-group/new-group.page.scss
+++ b/src/app/pages/chat/new-group/new-group.page.scss
@@ -47,7 +47,6 @@ ion-content{
     transform: translate3d(0, 1px, 0);
     
     .title-content{
-      width: 360px;
       margin: 0px auto;
       overflow: auto;
       padding: 0 !important;
diff --git a/src/app/pages/chat/newchat/newchat.page.scss b/src/app/pages/chat/newchat/newchat.page.scss
index 11d380dea..87a747b8a 100644
--- a/src/app/pages/chat/newchat/newchat.page.scss
+++ b/src/app/pages/chat/newchat/newchat.page.scss
@@ -29,7 +29,6 @@ ion-content{
       padding-left: 20px;
     }
       .title-content{
-        width: 360px;
         margin: 0px auto;
         overflow: auto;
         padding: 0 !important;
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss
index 06a651622..8c8bf1543 100644
--- a/src/app/pages/events/event-detail/event-detail.page.scss
+++ b/src/app/pages/events/event-detail/event-detail.page.scss
@@ -94,7 +94,6 @@ ion-card{
 }
 
 .header-content{
-  width: 360px;
   overflow: auto;
   margin: 0 auto;
   padding-top: 25px;
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index 860c052db..aa0789549 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -20,7 +20,6 @@
   color:#000;
   transform: translate3d(0, 1px, 0);
     .header-top{
-      width: 360px;
       margin: 0px auto;
       overflow: auto;
       padding: 0 !important;
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
index 860c052db..aa0789549 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
@@ -20,7 +20,6 @@
   color:#000;
   transform: translate3d(0, 1px, 0);
     .header-top{
-      width: 360px;
       margin: 0px auto;
       overflow: auto;
       padding: 0 !important;
diff --git a/src/app/pages/publications/gallery/gallery.page.scss b/src/app/pages/publications/gallery/gallery.page.scss
index ed2df3683..468d9e462 100644
--- a/src/app/pages/publications/gallery/gallery.page.scss
+++ b/src/app/pages/publications/gallery/gallery.page.scss
@@ -60,7 +60,6 @@
     overflow: auto;
   }
   .title-content{
-    width: 360px;
     margin: 0px auto;
     overflow: auto;
     padding: 0 !important;
diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.scss b/src/app/shared/chat/new-group/contacts/contacts.page.scss
index c97008f82..54523dbf8 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.page.scss
+++ b/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;
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.scss b/src/app/shared/gabinete-digital/expediente/expediente.page.scss
index b906a9f52..b14a6c4e2 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.scss
+++ b/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;

From c430cde2794160d27e2adf2ba73a8d075a838aa2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 13:50:57 +0100
Subject: [PATCH 4/9] Improve segments

---
 .../gabinete-digital/despachos-pr/despachos-pr.page.html  | 7 +++++--
 .../gabinete-digital/despachos-pr/despachos-pr.page.ts    | 8 +++++++-
 .../gabinete-digital/despachos-pr/despachos-pr.page.html  | 7 +++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index 6f8adcaa7..ad5144145 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -1,13 +1,16 @@
 <ion-header class="ion-no-border1">
   <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)">
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 280bb7821..a4d063809 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -14,6 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 
 import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
+import { User } from 'src/app/models/user.model';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -44,18 +45,23 @@ export class DespachosPrPage implements OnInit {
   dicIndex = 0;
   inicial = false
   
+  loggeduser: User;
+
   constructor (
     private processes:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
     private authService: AuthService,
-    private navParams: NavParams
+    private navParams: NavParams,
     ) { 
 
+      this.loggeduser = authService.ValidatedUser;
       this.profile = this.navParams.get('profile') || 'mdgpr';
+      
     }
   
   ngOnInit() {
+    
     //Inicializar segment
     this.segment = "despachos";
     this.LoadList();
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index a1e09c72f..b687eb52d 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -1,13 +1,16 @@
 <ion-header class="ion-no-border1">
   <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)">

From 565e9877f476001a0e72d497b7ead64ac34caf6a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 14:02:14 +0100
Subject: [PATCH 5/9] Remove default ionic header border

---
 .../pages/gabinete-digital/despachos-pr/despachos-pr.page.html  | 2 +-
 src/app/pages/gabinete-digital/despachos/despachos.page.html    | 2 +-
 src/app/pages/gabinete-digital/pendentes/pendentes.page.html    | 2 +-
 .../shared/gabinete-digital/despachos-pr/despachos-pr.page.html | 2 +-
 src/app/shared/gabinete-digital/pedidos/pedidos.page.html       | 2 +-
 src/app/shared/gabinete-digital/pendentes/pendentes.page.html   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index ad5144145..96bbb9bb4 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border1">
+<ion-header class="ion-no-border">
   <div class="main-header">
     <div class="thetitle">
       <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index cc00ed241..c6b5dc001 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header class="ion-no-border">
   <div class="title">
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
     <div class="theicon">
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index 1d85d1b84..ef6818ff2 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -1,4 +1,4 @@
-<ion-header>
+<ion-header class="ion-no-border">
   <app-btn-modal-dismiss></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index b687eb52d..271a16af0 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border1">
+<ion-header class="ion-no-border">
   <div class="main-header">
     <div class="thetitle">
       <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 346fda517..57758dff2 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/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">
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index 62a1a68f3..4fc84cb0a 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/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">

From e9c9173ba9ab4f829aa43cb820b5cd90a20b8b00 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 14:16:40 +0100
Subject: [PATCH 6/9] Improve modal remove an wanted border

---
 src/app/pages/gabinete-digital/gabinete-digital.page.html   | 6 ++++--
 .../publication-detail/publication-detail.page.scss         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 78e894afe..0070a1163 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -115,7 +115,8 @@
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
             </div>
-            <p class="text-center exp-card-title ">Diplomas por Validar</p>
+            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas por Validar</p>
+            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Diplomas por Assinar</p>
             <p class="text-center exp-card-content"><span class="number">{{count_dip_pv}}</span> <span class="title1">Documentos</span> </p>
           </div>
 
@@ -123,7 +124,8 @@
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
             </div>
-            <p class="text-center exp-card-title ">Diplomas assinaldos PR</p>
+            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas assinaldos PR</p>
+            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'" >Diplomas</p>
             <p class="text-center exp-card-content"><span class="number">{{ count_dip_Signed }}</span> <span class="title1">Documentos</span> </p>
           </div>
 
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
index ea263aad8..719348ea6 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
@@ -1,5 +1,5 @@
 :host{
-    background: #0782c9;
+   
   }
   ion-content{
     --background: transparent;

From f2b9b611337a60d757baf3713a74d617de21b684 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 14:20:57 +0100
Subject: [PATCH 7/9] Improve chat reponsiveness

---
 src/app/pages/chat/new-group/new-group.page.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss
index 1ca97f556..a5420829d 100644
--- a/src/app/pages/chat/new-group/new-group.page.scss
+++ b/src/app/pages/chat/new-group/new-group.page.scss
@@ -100,7 +100,6 @@ ion-content{
     padding: 15px 20px 0 20px;
 
     .item-container{
-        width: 360px;
         margin: 15px auto;
         border: 1px solid #ebebeb;
         border-radius: 5px;

From b646c221a91d9eb1c9a10f264f9be591d246fda2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 14:24:18 +0100
Subject: [PATCH 8/9] Improve gabinete digital document counting

---
 src/app/pages/gabinete-digital/gabinete-digital.page.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 0070a1163..6536aab4b 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -84,7 +84,7 @@
             </div>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p> 
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despacho</p> 
-            <p class="text-center exp-card-content"><span class="number">{{ count_de_pr }}</span> <span class="title1">Documentos</span> </p>
+            <p class="text-center exp-card-content">{{ count_de_pr }} <span class="title1">Documentos</span> </p>
           </div>
 
           <div (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100">
@@ -106,7 +106,7 @@
               </div>
               <div class="exp-card-text">
                 <p class="text-center exp-card-title">Despacho do Presidente da República</p>
-                <p class="text-center exp-card-content"><span class="number">{{ count_de_pr }}</span> <span class="title1">Documentos</span> </p>
+                <p class="text-center exp-card-content">{{ count_de_pr }} <span class="title1">Documentos</span> </p>
               </div>
             </div>
           </div>
@@ -117,7 +117,7 @@
             </div>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas por Validar</p>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Diplomas por Assinar</p>
-            <p class="text-center exp-card-content"><span class="number">{{count_dip_pv}}</span> <span class="title1">Documentos</span> </p>
+            <p class="text-center exp-card-content">{{count_dip_pv}} <span class="title1">Documentos</span> </p>
           </div>
 
           <div (click)="openSignedDiploma('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="exp-card d-flex flex-column justify-center" *ngIf="loggeduser.Profile == 'MDGPR'">
@@ -126,7 +126,7 @@
             </div>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas assinaldos PR</p>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'" >Diplomas</p>
-            <p class="text-center exp-card-content"><span class="number">{{ count_dip_Signed }}</span> <span class="title1">Documentos</span> </p>
+            <p class="text-center exp-card-content">{{count_dip_Signed}} <span class="title1">Documentos</span></p>
           </div>
 
         </div>

From e953df8552be2ac7d0eabba421e4633d0ebfdecf Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 21 May 2021 15:34:45 +0100
Subject: [PATCH 9/9] Improve segment

---
 .../pages/gabinete-digital/gabinete-digital.page.html |  6 ++++--
 .../expedientes-pr/expedientes-pr.page.html           |  2 +-
 .../expedientes-pr/expedientes-pr.page.ts             |  6 ++++++
 .../header-no-search/profile/profile.component.html   |  4 ++--
 .../header-no-search/profile/profile.component.ts     | 11 ++++++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

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 @@
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
             </div>
-            <p class="text-center exp-card-title ">Expediente Presidente</p>
+            <p class="exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Expediente Presidente</p>
+            <p class="exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Expediente</p>
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
@@ -93,7 +94,8 @@
                 <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
               </div>
               <div class="exp-card-text">
-                <p class="exp-card-title ">Expediente Presidente</p>
+                <p class="exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Expediente Presidente</p>
+                <p class="exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Expediente</p>
                 <p class="exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
               </div>
             </div>
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 @@
       </button>
     </div>
   </div>
-  <ion-toolbar>
+  <ion-toolbar *ngIf="loggeduser.Profile == 'MDGPR'">
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="expedientes">
         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<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() {
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 @@
     
         <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>
 
 
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() {}