From 6fba6c0d64eb738bbd23e6888a97ae428c155881 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 15 Mar 2021 15:19:07 +0100
Subject: [PATCH 01/15] save

---
 src/app/app-routing.module.ts                 | 54 ++++++++++---------
 src/app/app.module.ts                         |  2 +-
 src/app/pages/chat/chat.module.ts             |  5 +-
 src/app/pages/chat/chat.page.html             |  6 ++-
 src/app/pages/chat/chat.page.ts               | 19 ++++++-
 .../empty-chat/empty-chat-routing.module.ts   | 17 ++++++
 .../chat/empty-chat/empty-chat.module.ts      | 20 +++++++
 .../chat/empty-chat/empty-chat.page.html      |  5 ++
 .../chat/empty-chat/empty-chat.page.scss      |  5 ++
 .../chat/empty-chat/empty-chat.page.spec.ts   | 24 +++++++++
 .../shared/chat/empty-chat/empty-chat.page.ts | 15 ++++++
 .../chat/messages/contacts/contacts.module.ts |  6 +--
 src/app/shared/shared.module.ts               |  3 ++
 13 files changed, 148 insertions(+), 33 deletions(-)
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat-routing.module.ts
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat.module.ts
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat.page.html
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat.page.scss
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat.page.spec.ts
 create mode 100644 src/app/shared/chat/empty-chat/empty-chat.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8ea73ab47..8d9efe98a 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,27 +1,31 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { ChatPage } from './pages/chat/chat.page';
-import { MessagesPage } from './pages/chat/messages/messages.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { ChatPage } from './pages/chat/chat.page';
+import { MessagesPage } from './pages/chat/messages/messages.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+  },
+  {
+    path: '',
+    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
+  },
  {
+    path: 'empty-chat',
+    loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
   },
-  {
-    path: '',
-    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
-  },
- /*  {
-    path: 'chat',
-    component: ChatPage
-  } */
 
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+ /*  {
+    path: 'chat',
+    component: ChatPage
+  } */
+
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index adaccc9db..a88262399 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -45,7 +45,7 @@ import { MessagesPage } from './pages/chat/messages/messages.page';
     IonicStorageModule.forRoot(),
     AppRoutingModule, 
     PipesModule,
-    HttpClientModule, 
+    HttpClientModule,
     ],
   providers: [
     StatusBar,
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index 0d1929a26..066c25c5f 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -11,6 +11,8 @@ import { SharedModule } from 'src/app/shared/shared.module';
 import { RouterModule } from '@angular/router';
 import { GroupMessagesPage } from 'src/app/shared/chat/group-messages/group-messages.page';
 import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
+import { EmptyChatPage } from 'src/app/shared/chat/empty-chat/empty-chat.page';
+import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.page';
 
 @NgModule({
   imports: [
@@ -24,9 +26,10 @@ import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
   declarations: [
     ChatPage,
     MessagesPage,
+    ContactsPage,
     GroupMessagesPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
-  entryComponents: [MessagesPage, GroupMessagesPage]
+  entryComponents: [MessagesPage,ContactsPage, GroupMessagesPage]
 })
 export class ChatPageModule {}
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 53f03b5e2..ca88f46e6 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -18,7 +18,7 @@
             </div>
             <div class="div-icon">
               <ion-icon slot="end" (click)="newGroup()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
-              <ion-icon slot="end" (click)="selectContact()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
+              <ion-icon slot="end" (click)="openContactsPage()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
             </div>
           </div>
         <ion-toolbar>
@@ -90,8 +90,10 @@
         <!-- <ion-button (click)="openMessagesPage()">Messages</ion-button>
         <ion-button (click)="openGroupMessagesPage('MduvQyrQBejb3xMrY')">Groups</ion-button>
         <ion-button (click)="destroyComponent()">Destroy</ion-button> -->
+        <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
-        <app-group-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showGroupMessages" #messagecontainer></app-group-messages>
+        <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
+        <app-group-messages *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index e31f52f53..a222e14b0 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -57,7 +57,9 @@ export class ChatPage implements OnInit {
   componentRef: any;
 
   roomId:any;
+  showEmptyComponent=true;
   showMessages=false;
+  showContacts=false;
   showGroupMessages=false;
 
   @Output() getRoomInfo;
@@ -99,7 +101,9 @@ export class ChatPage implements OnInit {
   }
   closeAllDesktopComponents() {
     this.showMessages=false;
+    this.showContacts=false;
     this.showGroupMessages=false;
+    this.showEmptyComponent=false;
   }
   openMessagesPage(rid) {
     if( window.innerWidth <= 1024){
@@ -107,22 +111,35 @@ export class ChatPage implements OnInit {
     }
     else{
       this.closeAllDesktopComponents();
+      this.showEmptyComponent = false;
       this.roomId = rid;
       this.showMessages=true;
     }
   }
+  openContactsPage() {
+    console.log('OK');
+    this.closeAllDesktopComponents();
+    
+    if( window.innerWidth <= 1024){
+      //this.selectContact();
+    }
+    else{
+      console.log('here');
+      this.showContacts=true;
+    }
+  }
   openGroupMessagesPage(rid) {
     if( window.innerWidth <= 1024){
       this.openGroupMessagesModal(rid);
     }
     else{
       this.closeAllDesktopComponents();
+      this.showEmptyComponent = false;
       this.roomId = rid;
       this.showGroupMessages=true;
     }
   }
 
-  
   onSegmentChange(){
     this.load();
   }
diff --git a/src/app/shared/chat/empty-chat/empty-chat-routing.module.ts b/src/app/shared/chat/empty-chat/empty-chat-routing.module.ts
new file mode 100644
index 000000000..f35c9faa0
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EmptyChatPage } from './empty-chat.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EmptyChatPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EmptyChatPageRoutingModule {}
diff --git a/src/app/shared/chat/empty-chat/empty-chat.module.ts b/src/app/shared/chat/empty-chat/empty-chat.module.ts
new file mode 100644
index 000000000..bf6038f1c
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EmptyChatPageRoutingModule } from './empty-chat-routing.module';
+
+import { EmptyChatPage } from './empty-chat.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EmptyChatPageRoutingModule
+  ],
+  declarations: [EmptyChatPage]
+})
+export class EmptyChatPageModule {}
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.html b/src/app/shared/chat/empty-chat/empty-chat.page.html
new file mode 100644
index 000000000..b5514095a
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.html
@@ -0,0 +1,5 @@
+<ion-content>
+  <div class="center height-100">
+    <p>Sem conversa selecionada</p>
+  </div>
+</ion-content>
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.scss b/src/app/shared/chat/empty-chat/empty-chat.page.scss
new file mode 100644
index 000000000..6483b8c01
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.scss
@@ -0,0 +1,5 @@
+.center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
\ No newline at end of file
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.spec.ts b/src/app/shared/chat/empty-chat/empty-chat.page.spec.ts
new file mode 100644
index 000000000..361635c9e
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EmptyChatPage } from './empty-chat.page';
+
+describe('EmptyChatPage', () => {
+  let component: EmptyChatPage;
+  let fixture: ComponentFixture<EmptyChatPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EmptyChatPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EmptyChatPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.ts b/src/app/shared/chat/empty-chat/empty-chat.page.ts
new file mode 100644
index 000000000..fff63b39d
--- /dev/null
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-empty-chat',
+  templateUrl: './empty-chat.page.html',
+  styleUrls: ['./empty-chat.page.scss'],
+})
+export class EmptyChatPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts
index 8284984be..b90d8af4e 100644
--- a/src/app/shared/chat/messages/contacts/contacts.module.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.module.ts
@@ -8,7 +8,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
 
 import { ContactsPage } from './contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { PipesModule } from 'src/app/pipes/pipes.module';
+import { FilterPipe } from 'src/app/pipes/filter.pipe';
 
 @NgModule({
   imports: [
@@ -16,9 +16,9 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
     FormsModule,
     IonicModule,
     SharedModule,
-    PipesModule,
     ContactsPageRoutingModule
   ],
-  declarations: [ContactsPage]
+  exports: [FilterPipe],
+  declarations: [ContactsPage, FilterPipe]
 })
 export class ContactsPageModule {}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7b1be4f52..7924c965b 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -8,6 +8,7 @@ import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
 import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page';
 import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
 import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page';
+import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
 
 @NgModule({
   imports: [
@@ -21,6 +22,7 @@ import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.
     HeaderNoSearchPage, 
     BtnSeguintePage,
     BtnModalDismissPage,
+    EmptyChatPage,
   ],
   entryComponents:[],
   declarations: [
@@ -29,6 +31,7 @@ import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.
     HeaderNoSearchPage,
     BtnSeguintePage,
     BtnModalDismissPage,
+    EmptyChatPage,
   ]
 })
 export class SharedModule {}
\ No newline at end of file

From 4c29d70adfe135c08205002f1b6f6043f122c4b0 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 15 Mar 2021 18:09:41 +0100
Subject: [PATCH 02/15] style new group view desktop/tablet

---
 src/app/pages/chat/chat.module.ts                |  9 ++++++++-
 src/app/pages/chat/chat.page.html                |  3 ++-
 src/app/pages/chat/chat.page.ts                  | 11 +++++++++++
 .../shared/chat/new-group/new-group.page.html    |  7 ++-----
 .../shared/chat/new-group/new-group.page.scss    | 16 +++++++++-------
 src/app/shared/chat/new-group/new-group.page.ts  | 10 ++++++----
 6 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index 066c25c5f..70faea048 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -13,6 +13,7 @@ import { GroupMessagesPage } from 'src/app/shared/chat/group-messages/group-mess
 import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
 import { EmptyChatPage } from 'src/app/shared/chat/empty-chat/empty-chat.page';
 import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.page';
+import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
 
 @NgModule({
   imports: [
@@ -28,8 +29,14 @@ import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.pag
     MessagesPage,
     ContactsPage,
     GroupMessagesPage,
+    NewGroupPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
-  entryComponents: [MessagesPage,ContactsPage, GroupMessagesPage]
+  entryComponents: [
+    MessagesPage,
+    ContactsPage, 
+    GroupMessagesPage,
+    NewGroupPage,
+  ]
 })
 export class ChatPageModule {}
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index ca88f46e6..d70bfca1b 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -17,7 +17,7 @@
               <ion-label class="title">Chat</ion-label>
             </div>
             <div class="div-icon">
-              <ion-icon slot="end" (click)="newGroup()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
+              <ion-icon slot="end" (click)="openNewGroupPage()" src="assets/images/icons-chat-new-group.svg" ></ion-icon>
               <ion-icon slot="end" (click)="openContactsPage()" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
             </div>
           </div>
@@ -93,6 +93,7 @@
         <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
         <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
+        <app-new-group *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
         <app-group-messages *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index a222e14b0..38ff6c12b 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -60,6 +60,7 @@ export class ChatPage implements OnInit {
   showEmptyComponent=true;
   showMessages=false;
   showContacts=false;
+  showNewGroup=false;
   showGroupMessages=false;
 
   @Output() getRoomInfo;
@@ -102,6 +103,7 @@ export class ChatPage implements OnInit {
   closeAllDesktopComponents() {
     this.showMessages=false;
     this.showContacts=false;
+    this.showNewGroup=false;
     this.showGroupMessages=false;
     this.showEmptyComponent=false;
   }
@@ -128,6 +130,15 @@ export class ChatPage implements OnInit {
       this.showContacts=true;
     }
   }
+  openNewGroupPage() {
+    if( window.innerWidth <= 1024){
+      this.newGroup();
+    }
+    else{
+      this.closeAllDesktopComponents();
+      this.showNewGroup=true;
+    }
+  }
   openGroupMessagesPage(rid) {
     if( window.innerWidth <= 1024){
       this.openGroupMessagesModal(rid);
diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html
index b53fdda69..fcc87ac41 100644
--- a/src/app/shared/chat/new-group/new-group.page.html
+++ b/src/app/shared/chat/new-group/new-group.page.html
@@ -2,9 +2,6 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
-        <div class="left">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-        </div>
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>
         </div>
@@ -15,11 +12,11 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content">
+  <div class="main-content width-100">
     <div class="item-container">
       <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
     </div>
-    <div *ngIf="false" class="item-container-no-border">
+    <div *ngIf="true" class="item-container-no-border">
       <ion-checkbox (ionChange)="_ionChange($event)" color="primary"></ion-checkbox>
       <ion-label>Grupo Ultra-secreto</ion-label>
     </div>
diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/shared/chat/new-group/new-group.page.scss
index 428f62e08..025d3aedd 100644
--- a/src/app/shared/chat/new-group/new-group.page.scss
+++ b/src/app/shared/chat/new-group/new-group.page.scss
@@ -47,7 +47,7 @@ ion-content{
     transform: translate3d(0, 1px, 0);
     
     .title-content{
-      width: 360px;
+      //width: 360px;
       margin: 0px auto;
       overflow: auto;
       padding: 0 !important;
@@ -63,7 +63,7 @@ ion-content{
         padding: 0!important;
         float: left;
         width: 221px;
-        margin: 2.5px 0 0 5px;
+        //margin: 2.5px 0 0 5px;
       }
       .right{
         padding: 0!important;
@@ -101,7 +101,7 @@ ion-content{
     padding: 15px 20px 0 20px;
 
     .item-container{
-        width: 360px;
+        //width: 360px;
         margin: 15px auto;
         border: 1px solid #ebebeb;
         border-radius: 5px;
@@ -110,7 +110,7 @@ ion-content{
 
       .item-container-no-border{
         display: flex;
-        width: 360px;
+        //width: 360px;
         margin: 25px auto;
         border-radius: 5px;
         align-items: center;
@@ -124,15 +124,16 @@ ion-content{
   }
 
   .container-div{
+    width: 100%;
     margin-bottom: 15px;
     overflow: auto;
 
     .ion-item-class-2{
-        width: 360px;
+        width: 100%;
         margin: 0px auto;
 
         .ion-icon-class{
-            width: 45px;
+            width: 5%;
             height: 45px;
             float: left;
             padding: 10px;
@@ -140,12 +141,13 @@ ion-content{
           }
       }
       .ion-input-class{
-        width: 315px;
+        width: 93%;
         height: 45px;
         border: 1px solid #ebebeb;
         border-radius: 5px;
         padding-left: 5px;
         padding-right: 10px;
+        margin-left: 2%;
         float: left;
       }
   }
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 6774503b1..21872959a 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -1,5 +1,5 @@
 import { analyzeAndValidateNgModules } from '@angular/compiler';
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
 import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
 import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
@@ -15,17 +15,19 @@ export class NewGroupPage implements OnInit {
   displayDuration: any;
   showDuration: boolean;
   selectedDuration = ['','',''];
-  groupName:string;
+  //groupName:string;
+
+  @Input() groupName:string;
 
   constructor(
     private pickerController: PickerController,
     private popoverController: PopoverController,
     private modalController: ModalController,
-    private navParams: NavParams,
+    //private navParams: NavParams,
   ) 
   { 
     this.isGroupCreated = false;
-    this.groupName = this.navParams.get('name');
+    //this.groupName = this.navParams.get('name');
   }
 
   ngOnInit() {

From 79310babc8b227712ac45a481959821dde296d48 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 16 Mar 2021 14:33:11 +0100
Subject: [PATCH 03/15] save

---
 .../group-contacts/group-contacts.page.ts     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index c1fdc3618..fad0eb6ee 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { ModalController, NavParams } from '@ionic/angular';
 import * as _ from 'lodash';
 import { AuthService } from 'src/app/services/auth.service';
@@ -31,12 +31,14 @@ export class GroupContactsPage implements OnInit {
   groupName:string;
   selectedUserList:any;
 
+  @Input() roomId:string;
+
   constructor(
     private modalController: ModalController,
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
-    private navParams: NavParams,
+    //private navParams: NavParams,
   ) 
   {
     this.authService.userData$.subscribe((res:any)=>{
@@ -45,18 +47,31 @@ export class GroupContactsPage implements OnInit {
     this.textSearch="";
     this.dm=null;
     this.room=null;
-    this.isGroupCreated = this.navParams.get('isCreated');
+    /* this.isGroupCreated = this.navParams.get('isCreated');
     this.groupName = this.navParams.get('name');
     this.room = this.navParams.get('room');
-    this.members = this.navParams.get('members');
+    this.members = this.navParams.get('members'); */
   }
 
   ngOnInit() {
+    this.getRoomInfo();
     this.loadUsers();
     console.log(this.groupName);
     console.log(this.isGroupCreated);
   }
 
+  getRoomInfo(){
+    this.showLoader = true;
+    this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
+      this.room = room['room'];
+      this.groupName = this.room.name.split('-').join(' ');
+      /* this.roomName = this.room.name.split('-').join(' ');
+      this.getGroupContacts(this.room);
+      this.loadGroupMessages(this.room); */
+      this.showLoader = false;
+    });
+  }
+
   loadUsers(){
     this.options = { 
       headers: this.headers,
@@ -156,8 +171,8 @@ export class GroupContactsPage implements OnInit {
   }
 
   createGroup(){
+    console.log(this.groupName);
     if(!this.isGroupCreated){
-      /* this.close(); */
       let body = { "name":this.groupName, }
       this.chatService.addGroup(body).subscribe(res=>{
         console.log('group created');
@@ -170,15 +185,7 @@ export class GroupContactsPage implements OnInit {
     }
     else{
       this.addContacts(this.room);
-      this.close();
-      /* this.openGroupMessages(this.room); */
-      /* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
-        console.log(res);
-        
-        this.addContacts(res['group']);
-        this.openGroupMessages(res['group']);
-      }) */
-      
+      this.close(); 
     } 
   }
 

From eccad1e3331c79c0498c5b22fc6e7842e4fbacaa Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 16 Mar 2021 14:33:36 +0100
Subject: [PATCH 04/15] save

---
 src/app/pages/agenda/agenda.page.ts           |  2 +-
 src/app/pages/chat/chat.module.ts             |  3 ++
 src/app/pages/chat/chat.page.html             |  3 +-
 src/app/pages/chat/chat.page.ts               | 11 ++++
 .../group-contacts/group-contacts.page.html   | 10 ++--
 .../group-contacts/group-contacts.page.scss   | 24 +++------
 .../group-contacts-routing.module.ts          | 17 +++++++
 .../group-contacts/group-contacts.module.ts   | 20 ++++++++
 .../group-contacts/group-contacts.page.html   |  9 ++++
 .../group-contacts/group-contacts.page.scss   |  0
 .../group-contacts.page.spec.ts               | 24 +++++++++
 .../group-contacts/group-contacts.page.ts     | 15 ++++++
 .../new-group/new-group-routing.module.ts     | 50 ++++++++++---------
 .../shared/chat/new-group/new-group.page.html |  2 +-
 .../shared/chat/new-group/new-group.page.ts   | 19 ++++++-
 15 files changed, 159 insertions(+), 50 deletions(-)
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts.page.html
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts
 create mode 100644 src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 73f143d4a..3046e9671 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -762,7 +762,7 @@ export class AgendaPage implements OnInit {
 
   async cloneAllmobileComponent(){
     
-    this.mobileComponent= {
+    this.mobileComponent = {
       showAddNewEvent: false,
       showEditEvent: false,
       showEventDitails: false,
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index 70faea048..340239ee6 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -14,6 +14,7 @@ import { MessagesPage } from 'src/app/shared/chat/messages/messages.page';
 import { EmptyChatPage } from 'src/app/shared/chat/empty-chat/empty-chat.page';
 import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.page';
 import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
+import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page';
 
 @NgModule({
   imports: [
@@ -30,6 +31,7 @@ import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
     ContactsPage,
     GroupMessagesPage,
     NewGroupPage,
+    GroupContactsPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   entryComponents: [
@@ -37,6 +39,7 @@ import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
     ContactsPage, 
     GroupMessagesPage,
     NewGroupPage,
+    GroupContactsPage,
   ]
 })
 export class ChatPageModule {}
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d70bfca1b..9538e432b 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -93,7 +93,8 @@
         <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
         <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
-        <app-new-group *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
+        <app-new-group (closeAllDesktopComponent)="openGroupContactsPage()" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
+        <app-group-contacts [roomId]="roomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
         <app-group-messages *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 38ff6c12b..059c39639 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -62,6 +62,7 @@ export class ChatPage implements OnInit {
   showContacts=false;
   showNewGroup=false;
   showGroupMessages=false;
+  showGroupContacts=false;
 
   @Output() getRoomInfo;
 
@@ -106,6 +107,16 @@ export class ChatPage implements OnInit {
     this.showNewGroup=false;
     this.showGroupMessages=false;
     this.showEmptyComponent=false;
+    console.log('All components closed!');
+  }
+  openGroupContactsPage(){
+    this.closeAllDesktopComponents();
+    if(window.innerWidth <= 1024){
+
+    }
+    else{
+      this.showGroupContacts = true;
+    }
   }
   openMessagesPage(rid) {
     if( window.innerWidth <= 1024){
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index f63a629a8..e9c4d1253 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -1,7 +1,7 @@
 <ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
-    <div class="main-header">
-      <div class="title-content">
+    <div class="main-header width-100">
+      <div class="title-content width-100">
         <div class="back-icon">
           <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
         </div>
@@ -41,7 +41,7 @@
       </ion-list>
     </div>
 
-    <ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
   
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
@@ -49,8 +49,8 @@
 
       <div *virtualItem="let user" class="item-checkbox">
         <ion-checkbox (ionChange)="selectedContact(user)" color="primary"></ion-checkbox>
-         <p>{{user.name}}</p>
-        <ion-icon name="ellipse"></ion-icon>
+        <ion-label>{{user.name}}</ion-label>
+        <div class="icon"><ion-icon name="ellipse"></ion-icon></div>
       </div>
       
     </ion-virtual-scroll>
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
index 829026a52..876e8cf68 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
@@ -3,11 +3,8 @@
     --opacity: 1;
  
    .main-header{
-     width: 100%; /* 400px */
      height: 100%;
      font-family: Roboto;
-     border-top-left-radius: 25px;
-     border-top-right-radius: 25px;
      background-color: #fff;
      overflow:hidden;
      padding: 30px 20px 0px 20px;
@@ -26,7 +23,6 @@
        padding-left: 20px;
      }
        .title-content{
-         width: 360px;
          margin: 0px auto;
          overflow: auto;
          padding: 0 !important;
@@ -62,28 +58,28 @@
      border-radius: 5px;
    }
    .search ion-searchbar{
-     /* border: 1px solid green; */
      width: 100%;
      margin: 0 !important;
      padding: 0 !important;
      --border-radius: 5px;
      --box-shadow: none;
-     overflow: auto;
+     overflow: hidden;
      --icon-color:#0d89d1;
    }
- 
  }
+
  ion-content{
    --background:transparent;
  }
+
  .main-content{
    width: 100%;
    height: 100%;
    font-family: Roboto;
    margin: 0 auto;
    background-color: #fff;
-   overflow:auto;
    padding: 0 0 0 0;
+   overflow:auto;
 
     .members-label{
       margin: 10px 20px 10px 20px !important;
@@ -111,8 +107,6 @@
        display: flex;
        margin: 10px 20px 10px 20px !important;
        overflow: auto;
-       align-items: center;
- 
      }
  
      .item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
@@ -121,20 +115,16 @@
          float: left;
      }
  
-     .item-checkbox p, .members-checkbox p{
-         display: block;
-         margin: 0 !important;
-         width: 330px;
+     .item-checkbox ion-label, .members-checkbox p{
          padding-left: 10px;
          font-size: 15px;
          color: #0d89d1;
          float: left;
+         flex-grow: 1;
      }
-     .item-checkbox ion-icon, .members-checkbox ion-icon{
+     .icon, .members-checkbox ion-icon{
        font-size: 10px;
-       float: left;
        color:#99e47b;
-       margin-left: 10px;
      }
    }
  
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts
new file mode 100644
index 000000000..c998741ed
--- /dev/null
+++ b/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GroupContactsPage } from './group-contacts.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: GroupContactsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class GroupContactsPageRoutingModule {}
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts
new file mode 100644
index 000000000..2946bd28c
--- /dev/null
+++ b/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { GroupContactsPageRoutingModule } from './group-contacts-routing.module';
+
+import { GroupContactsPage } from './group-contacts.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    GroupContactsPageRoutingModule
+  ],
+  declarations: [GroupContactsPage]
+})
+export class GroupContactsPageModule {}
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html
new file mode 100644
index 000000000..7cca9b8cf
--- /dev/null
+++ b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>group-contacts</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts
new file mode 100644
index 000000000..5d3e2033f
--- /dev/null
+++ b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { GroupContactsPage } from './group-contacts.page';
+
+describe('GroupContactsPage', () => {
+  let component: GroupContactsPage;
+  let fixture: ComponentFixture<GroupContactsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ GroupContactsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(GroupContactsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts
new file mode 100644
index 000000000..7cb431b9a
--- /dev/null
+++ b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-group-contacts',
+  templateUrl: './group-contacts.page.html',
+  styleUrls: ['./group-contacts.page.scss'],
+})
+export class GroupContactsPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/shared/chat/new-group/new-group-routing.module.ts b/src/app/shared/chat/new-group/new-group-routing.module.ts
index 42b9b7e24..8d2201158 100644
--- a/src/app/shared/chat/new-group/new-group-routing.module.ts
+++ b/src/app/shared/chat/new-group/new-group-routing.module.ts
@@ -1,25 +1,29 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { NewGroupPage } from './new-group.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: NewGroupPage
-  },
-  {
-    path: 'contacts',
-    loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
-  },
-  {
-    path: 'group-chat',
-    loadChildren: () => import('./group-chat/group-chat.module').then( m => m.GroupChatPageModule)
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { NewGroupPage } from './new-group.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: NewGroupPage
+  },
+  {
+    path: 'contacts',
+    loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
+  },
+  {
+    path: 'group-chat',
+    loadChildren: () => import('./group-chat/group-chat.module').then( m => m.GroupChatPageModule)
+  },
  {
+    path: 'group-contacts',
+    loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
   }
-];
 
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class NewGroupPageRoutingModule {}
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class NewGroupPageRoutingModule {}
diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html
index fcc87ac41..b2e9d9d23 100644
--- a/src/app/shared/chat/new-group/new-group.page.html
+++ b/src/app/shared/chat/new-group/new-group.page.html
@@ -5,7 +5,7 @@
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>
         </div>
-        <app-btn-seguinte *ngIf="groupName" (click)="addContacts()"></app-btn-seguinte>
+        <app-btn-seguinte *ngIf="groupName" (click)="createGroup()"></app-btn-seguinte> <!-- addContacts -->
       </div>
     </div>
   </ion-toolbar>
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 21872959a..335dc6253 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -1,6 +1,7 @@
 import { analyzeAndValidateNgModules } from '@angular/compiler';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, NavParams, PickerController, PopoverController } from '@ionic/angular';
+import { ChatService } from 'src/app/services/chat.service';
 import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
 import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page';
 
@@ -18,11 +19,13 @@ export class NewGroupPage implements OnInit {
   //groupName:string;
 
   @Input() groupName:string;
+  @Output() closeAllDesktopComponent = new EventEmitter<any>();
 
   constructor(
     private pickerController: PickerController,
     private popoverController: PopoverController,
     private modalController: ModalController,
+    private chatService: ChatService,
     //private navParams: NavParams,
   ) 
   { 
@@ -37,7 +40,19 @@ export class NewGroupPage implements OnInit {
     this.showDuration = event.detail.checked;
   }
   close(){
-    this.modalController.dismiss();
+    //this.modalController.dismiss();
+    console.log('close');
+    this.closeAllDesktopComponent.emit();
+  }
+  
+  createGroup(){
+    let name = this.groupName.split(' ').join('-');
+    let body = { "name":name, }
+    this.chatService.addGroup(body).subscribe(res=>{
+      console.log('group created');
+      console.log(res['group']);
+      this.closeAllDesktopComponent.emit(res['group']._id);
+    });
   }
 
   async addContacts(){

From 41d9c2b5b6565f9a3f5da341216542a88d959717 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 17 Mar 2021 09:06:42 +0100
Subject: [PATCH 05/15] save

---
 src/app/pages/chat/chat.page.html             |  4 ++--
 src/app/pages/chat/chat.page.scss             |  1 +
 src/app/pages/chat/chat.page.ts               | 15 +++++++++----
 .../group-contacts/group-contacts.page.html   |  2 +-
 .../group-contacts/group-contacts.page.ts     | 22 +++++++++----------
 .../shared/chat/new-group/new-group.page.ts   |  6 ++---
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 9538e432b..be3fe5977 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -93,8 +93,8 @@
         <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
         <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
-        <app-new-group (closeAllDesktopComponent)="openGroupContactsPage()" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
-        <app-group-contacts [roomId]="roomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
+        <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
+        <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
         <app-group-messages *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index d9067fd6c..609d7e864 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -44,6 +44,7 @@ ion-content{
   overflow: auto;
 
   .aside-wrapper{
+    border: 1px solid red;
     padding: 0 !important;
     margin: 0 !important;
   }
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 059c39639..fc9d0e549 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -57,6 +57,7 @@ export class ChatPage implements OnInit {
   componentRef: any;
 
   roomId:any;
+  groupRoomId:any;
   showEmptyComponent=true;
   showMessages=false;
   showContacts=false;
@@ -107,9 +108,13 @@ export class ChatPage implements OnInit {
     this.showNewGroup=false;
     this.showGroupMessages=false;
     this.showEmptyComponent=false;
+    this.showGroupContacts=false;
     console.log('All components closed!');
   }
-  openGroupContactsPage(){
+  openGroupContactsPage(data){
+    console.log(data);
+    this.groupRoomId = data;
+    console.log(this.groupRoomId);
     this.closeAllDesktopComponents();
     if(window.innerWidth <= 1024){
 
@@ -150,14 +155,16 @@ export class ChatPage implements OnInit {
       this.showNewGroup=true;
     }
   }
-  openGroupMessagesPage(rid) {
+  openGroupMessagesPage(data) {
+    console.log('HERE');
+    
     if( window.innerWidth <= 1024){
-      this.openGroupMessagesModal(rid);
+      this.openGroupMessagesModal(data);
     }
     else{
       this.closeAllDesktopComponents();
       this.showEmptyComponent = false;
-      this.roomId = rid;
+      this.roomId = data;
       this.showGroupMessages=true;
     }
   }
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index e9c4d1253..7653713b6 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -8,7 +8,7 @@
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
         </div>
-        <app-btn-seguinte (click)="createGroup()"></app-btn-seguinte>
+        <app-btn-seguinte (click)="updateGroup()"></app-btn-seguinte>
       </div>
     </div>
   </ion-toolbar>
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index fad0eb6ee..ae7e9eb29 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, NavParams } from '@ionic/angular';
 import * as _ from 'lodash';
 import { AuthService } from 'src/app/services/auth.service';
@@ -32,6 +32,7 @@ export class GroupContactsPage implements OnInit {
   selectedUserList:any;
 
   @Input() roomId:string;
+  @Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private modalController: ModalController,
@@ -54,21 +55,19 @@ export class GroupContactsPage implements OnInit {
   }
 
   ngOnInit() {
-    this.getRoomInfo();
+    //this.getRoomInfo();
     this.loadUsers();
-    console.log(this.groupName);
-    console.log(this.isGroupCreated);
+    console.log(this.roomId);
+    //console.log(this.isGroupCreated);
   }
 
-  getRoomInfo(){
+  updateGroup(){
     this.showLoader = true;
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
       this.room = room['room'];
-      this.groupName = this.room.name.split('-').join(' ');
-      /* this.roomName = this.room.name.split('-').join(' ');
-      this.getGroupContacts(this.room);
-      this.loadGroupMessages(this.room); */
+      this.addContacts(this.room);
       this.showLoader = false;
+      this.openGroupMessage.emit(this.room._id)
     });
   }
 
@@ -162,7 +161,6 @@ export class GroupContactsPage implements OnInit {
       let body ={
         "roomId":room._id,
         "userId":user._id,
-        
       }
       this.chatService.addUserToGroup(body).subscribe(res=>{
         console.log(res['success']);
@@ -170,7 +168,7 @@ export class GroupContactsPage implements OnInit {
     });
   }
 
-  createGroup(){
+  /* createGroup(){
     console.log(this.groupName);
     if(!this.isGroupCreated){
       let body = { "name":this.groupName, }
@@ -187,7 +185,7 @@ export class GroupContactsPage implements OnInit {
       this.addContacts(this.room);
       this.close(); 
     } 
-  }
+  } */
 
   async newGroup(){
     this.close();
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 335dc6253..160e0e21e 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -19,7 +19,7 @@ export class NewGroupPage implements OnInit {
   //groupName:string;
 
   @Input() groupName:string;
-  @Output() closeAllDesktopComponent = new EventEmitter<any>();
+  @Output() addGroupMessage:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private pickerController: PickerController,
@@ -42,7 +42,7 @@ export class NewGroupPage implements OnInit {
   close(){
     //this.modalController.dismiss();
     console.log('close');
-    this.closeAllDesktopComponent.emit();
+    this.addGroupMessage.emit();
   }
   
   createGroup(){
@@ -51,7 +51,7 @@ export class NewGroupPage implements OnInit {
     this.chatService.addGroup(body).subscribe(res=>{
       console.log('group created');
       console.log(res['group']);
-      this.closeAllDesktopComponent.emit(res['group']._id);
+      this.addGroupMessage.emit(res['group']._id);
     });
   }
 

From c161ec0855c1d45ea34b4fd558715a537d72f634 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 17 Mar 2021 11:13:09 +0100
Subject: [PATCH 06/15] Improve workflow of creating new messages group + add
 new customised buttons

---
 src/app/app-routing.module.ts                 |  8 +++++++
 src/app/pages/chat/chat.page.html             |  4 ++--
 src/app/pages/chat/chat.page.scss             |  2 --
 .../btn-seguinte/btn-seguinte.page.html       |  2 +-
 .../btn-seguinte/btn-seguinte.page.scss       | 12 +++++-----
 .../btn-adicionar-routing.module.ts           | 17 +++++++++++++
 .../btn-adicionar/btn-adicionar.module.ts     | 20 ++++++++++++++++
 .../btn-adicionar/btn-adicionar.page.html     |  3 +++
 .../btn-adicionar/btn-adicionar.page.scss     |  7 ++++++
 .../btn-adicionar/btn-adicionar.page.spec.ts  | 24 +++++++++++++++++++
 .../btn-adicionar/btn-adicionar.page.ts       | 15 ++++++++++++
 .../btn-criar/btn-criar-routing.module.ts     | 17 +++++++++++++
 .../buttons/btn-criar/btn-criar.module.ts     | 20 ++++++++++++++++
 .../buttons/btn-criar/btn-criar.page.html     |  3 +++
 .../buttons/btn-criar/btn-criar.page.scss     |  7 ++++++
 .../buttons/btn-criar/btn-criar.page.spec.ts  | 24 +++++++++++++++++++
 .../buttons/btn-criar/btn-criar.page.ts       | 15 ++++++++++++
 .../group-contacts/group-contacts.page.html   |  4 ++--
 .../group-contacts/group-contacts.page.ts     |  5 ++++
 .../group-messages/group-messages.page.html   |  2 +-
 .../group-messages/group-messages.page.ts     |  7 +++++-
 .../shared/chat/new-group/new-group.page.html |  4 ++--
 src/app/shared/shared.module.ts               |  6 +++++
 23 files changed, 211 insertions(+), 17 deletions(-)
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
 create mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar.module.ts
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.html
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.scss
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
 create mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8d9efe98a..3dd13aae4 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -15,6 +15,14 @@ const routes: Routes = [
     path: 'empty-chat',
     loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
   },
+  {
+    path: 'btn-criar',
+    loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
+  },
+  {
+    path: 'btn-adicionar',
+    loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index be3fe5977..d05ced47c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -10,7 +10,7 @@
   </ion-refresher>
   <div class="main-content d-flex height-100">
       <!-- Aside left -->
-      <div class="d-flex aside-wrapper flex-column pt-25">
+      <div class="aside-wrapper d-flex flex-column pt-25">
        <!--  <p class="text-center mt-0 aside-title px-20">Chat</p> -->
           <div class="title-content">
             <div class="div-title">
@@ -95,7 +95,7 @@
         <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
         <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
         <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
-        <app-group-messages *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
+        <app-group-messages (openGroupContacts)="openGroupContactsPage($event)" *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 609d7e864..8c5e7498a 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -8,7 +8,6 @@ ion-content{
   .title-content{
     width: 100%;
     margin-bottom: 15px;
-    overflow: auto;
     padding: 0 !important;
     background: #fff;
 
@@ -44,7 +43,6 @@ ion-content{
   overflow: auto;
 
   .aside-wrapper{
-    border: 1px solid red;
     padding: 0 !important;
     margin: 0 !important;
   }
diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.html b/src/app/shared/btn-seguinte/btn-seguinte.page.html
index 2ecf0814d..526d8f40c 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.page.html
+++ b/src/app/shared/btn-seguinte/btn-seguinte.page.html
@@ -1,3 +1,3 @@
 <div class="right">
   <ion-label>Seguinte</ion-label>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.scss b/src/app/shared/btn-seguinte/btn-seguinte.page.scss
index fef7141e5..bc35e6d03 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.page.scss
+++ b/src/app/shared/btn-seguinte/btn-seguinte.page.scss
@@ -1,7 +1,7 @@
 .right{
-    padding: 0!important;
-    float: right;
-    font-size: 15px;
-    color: #0782c9;
-    margin: 8px 0 0 5px;
-  }
\ No newline at end of file
+  padding: 0!important;
+  float: right;
+  font-size: 15px;
+  color: #0782c9;
+  margin: 8px 0 0 5px;
+}
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
new file mode 100644
index 000000000..b6f074394
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: BtnAdicionarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class BtnAdicionarPageRoutingModule {}
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
new file mode 100644
index 000000000..42e7d2a67
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { BtnAdicionarPageRoutingModule } from './btn-adicionar-routing.module';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    BtnAdicionarPageRoutingModule
+  ],
+  declarations: [BtnAdicionarPage]
+})
+export class BtnAdicionarPageModule {}
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
new file mode 100644
index 000000000..e53e30f5d
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
@@ -0,0 +1,3 @@
+<div class="right">
+  <ion-label>Adicionar</ion-label>
+</div>
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
new file mode 100644
index 000000000..b7b93819b
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
@@ -0,0 +1,7 @@
+.right{
+    padding: 0!important;
+    float: right;
+    font-size: 15px;
+    color: #0782c9;
+    margin: 8px 5px 0 5px;
+  }
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
new file mode 100644
index 000000000..43026a2ac
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+describe('BtnAdicionarPage', () => {
+  let component: BtnAdicionarPage;
+  let fixture: ComponentFixture<BtnAdicionarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BtnAdicionarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BtnAdicionarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
new file mode 100644
index 000000000..55d0d768f
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-btn-adicionar',
+  templateUrl: './btn-adicionar.page.html',
+  styleUrls: ['./btn-adicionar.page.scss'],
+})
+export class BtnAdicionarPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts b/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
new file mode 100644
index 000000000..83df1196f
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: BtnCriarPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class BtnCriarPageRoutingModule {}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.module.ts b/src/app/shared/buttons/btn-criar/btn-criar.module.ts
new file mode 100644
index 000000000..311f914d5
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { BtnCriarPageRoutingModule } from './btn-criar-routing.module';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    BtnCriarPageRoutingModule
+  ],
+  declarations: [BtnCriarPage]
+})
+export class BtnCriarPageModule {}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.html b/src/app/shared/buttons/btn-criar/btn-criar.page.html
new file mode 100644
index 000000000..cf6ccee57
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.html
@@ -0,0 +1,3 @@
+<div class="right">
+  <ion-label>Criar grupo</ion-label>
+</div>
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.scss b/src/app/shared/buttons/btn-criar/btn-criar.page.scss
new file mode 100644
index 000000000..b7b93819b
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.scss
@@ -0,0 +1,7 @@
+.right{
+    padding: 0!important;
+    float: right;
+    font-size: 15px;
+    color: #0782c9;
+    margin: 8px 5px 0 5px;
+  }
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
new file mode 100644
index 000000000..ce36f9653
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+describe('BtnCriarPage', () => {
+  let component: BtnCriarPage;
+  let fixture: ComponentFixture<BtnCriarPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BtnCriarPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BtnCriarPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.ts
new file mode 100644
index 000000000..6afea0c23
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-btn-criar',
+  templateUrl: './btn-criar.page.html',
+  styleUrls: ['./btn-criar.page.scss'],
+})
+export class BtnCriarPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index 7653713b6..a2ae1f8b7 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -3,12 +3,12 @@
     <div class="main-header width-100">
       <div class="title-content width-100">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon (click)="openGroupMessagesPage()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
         </div>
-        <app-btn-seguinte (click)="updateGroup()"></app-btn-seguinte>
+        <app-btn-adicionar (click)="updateGroup()"></app-btn-adicionar>
       </div>
     </div>
   </ion-toolbar>
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index ae7e9eb29..8c2c6dea7 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -70,6 +70,11 @@ export class GroupContactsPage implements OnInit {
       this.openGroupMessage.emit(this.room._id)
     });
   }
+  openGroupMessagesPage(){
+    this.showLoader = true;
+    this.openGroupMessage.emit(this.roomId)
+    this.showLoader = false;
+  }
 
   loadUsers(){
     this.options = { 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 437f8909d..262a9813f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -9,7 +9,7 @@
           <ion-icon  (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
-      <div (click)="addContacts()" class="header-bottom">
+      <div (click)="openGroupContactsPage()" class="header-bottom">
         <div class="header-bottom-icon">
           <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
         </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 8578835ea..0f275b018 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnChanges, OnInit, Input, SimpleChanges} from '@angular/core';
+import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core';
 import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -25,6 +25,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   members:any;
 
   @Input() roomId:string;
+  @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private menu: MenuController,
@@ -49,6 +50,10 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     console.log(this.roomId);
   }
 
+  openGroupContactsPage(){
+    this.openGroupContacts.emit(this.roomId);
+  }
+
   close(){
     this.modalController.dismiss();
   }
diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html
index b2e9d9d23..02dc25311 100644
--- a/src/app/shared/chat/new-group/new-group.page.html
+++ b/src/app/shared/chat/new-group/new-group.page.html
@@ -5,7 +5,7 @@
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>
         </div>
-        <app-btn-seguinte *ngIf="groupName" (click)="createGroup()"></app-btn-seguinte> <!-- addContacts -->
+        <app-btn-criar *ngIf="groupName" (click)="createGroup()"></app-btn-criar> <!-- addContacts -->
       </div>
     </div>
   </ion-toolbar>
@@ -16,7 +16,7 @@
     <div class="item-container">
       <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
     </div>
-    <div *ngIf="true" class="item-container-no-border">
+    <div *ngIf="false" class="item-container-no-border">
       <ion-checkbox (ionChange)="_ionChange($event)" color="primary"></ion-checkbox>
       <ion-label>Grupo Ultra-secreto</ion-label>
     </div>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7924c965b..3b01186fc 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -9,6 +9,8 @@ import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'
 import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
 import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page';
 import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
+import { BtnCriarPage } from './buttons/btn-criar/btn-criar.page';
+import { BtnAdicionarPage } from './buttons/btn-adicionar/btn-adicionar.page';
 
 @NgModule({
   imports: [
@@ -23,6 +25,8 @@ import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
     BtnSeguintePage,
     BtnModalDismissPage,
     EmptyChatPage,
+    BtnCriarPage,
+    BtnAdicionarPage,
   ],
   entryComponents:[],
   declarations: [
@@ -32,6 +36,8 @@ import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
     BtnSeguintePage,
     BtnModalDismissPage,
     EmptyChatPage,
+    BtnCriarPage,
+    BtnAdicionarPage,
   ]
 })
 export class SharedModule {}
\ No newline at end of file

From 1b5d98dd2ba7b1dd467df08b8854a375ffa99ab0 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 17 Mar 2021 11:43:14 +0100
Subject: [PATCH 07/15] save

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

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 9018913ce..517a2659c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -43,7 +43,6 @@
 
           }
           .header-bottom-contacts{
-            width: 275px;
             font-size: 15px;
             color: #797979;
             white-space: nowrap;

From c16fc7197a8b8fde7370e85665508238b9639d6d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 18 Mar 2021 09:25:59 +0100
Subject: [PATCH 08/15] style menus

---
 src/app/pages/chat/chat.page.html             |  2 +-
 .../group-contacts/group-contacts.page.html   |  3 -
 .../group-messages/group-messages.page.html   |  2 +-
 .../group-messages/group-messages.page.ts     | 52 ++++++++++++++-
 .../chat/messages/contacts/contacts.page.html |  6 +-
 .../chat/messages/contacts/contacts.page.scss | 17 +++--
 .../chat/messages/contacts/contacts.page.ts   | 20 +++++-
 .../shared/chat/messages/messages.page.html   |  2 +-
 src/app/shared/chat/messages/messages.page.ts | 55 +++++++++++++++-
 .../chat-popover/chat-popover.page.html       | 16 ++++-
 .../chat-popover/chat-popover.page.scss       | 64 +++++++++++++++----
 .../popover/chat-popover/chat-popover.page.ts |  7 +-
 .../messages-options.page.html                | 18 +++---
 .../messages-options.page.scss                | 47 +++++++++++++-
 .../messages-options/messages-options.page.ts | 10 ++-
 src/assets/icon/icons-arrow-arrow-left.svg    | 11 ++++
 src/assets/images/icons-arrow-arrow-right.svg |  9 +++
 17 files changed, 291 insertions(+), 50 deletions(-)
 create mode 100644 src/assets/icon/icons-arrow-arrow-left.svg
 create mode 100644 src/assets/images/icons-arrow-arrow-right.svg

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index d05ced47c..445dc5297 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -92,7 +92,7 @@
         <ion-button (click)="destroyComponent()">Destroy</ion-button> -->
         <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
-        <app-contacts *ngIf="showContacts" class="d-flex height-100"></app-contacts>
+        <app-contacts (openMessage)="openMessagesPage($event)" *ngIf="showContacts" class="d-flex height-100 flex-column"></app-contacts>
         <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
         <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
         <app-group-messages (openGroupContacts)="openGroupContactsPage($event)" *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index a2ae1f8b7..dc129dd35 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -26,9 +26,6 @@
       </ion-refresher-content>
     </ion-refresher>
     
-      
-      
-
   <div class="main-content">
     <div *ngIf="members">
       <ion-label class="members-label">Contactos selecção:</ion-label>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 262a9813f..c5971d016 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -6,7 +6,7 @@
           <ion-label class="title">{{room.name.split('-').join(' ')}}</ion-label>
         </div>
         <div class="right">
-          <ion-icon  (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
+          <ion-icon  (click)="openGroupMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
       <div (click)="openGroupContactsPage()" class="header-bottom">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 0f275b018..7e3823775 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core';
-import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -34,6 +34,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     public popoverController: PopoverController,
     private chatService: ChatService,
     private authService: AuthService,
+    private animationController: AnimationController,
   ) {
     this.isGroupCreated = true;
   }
@@ -137,6 +138,55 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     });
     this.message = "";
   }
+  async openGroupMessagesOptions() {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+ 
+
+    /* const popover = await this.popoverController.create({
+      component: MessagesOptionsPage,
+      componentProps: {
+        roomId: this.dm._id,
+      },
+      cssClass: 'messages-options',
+      event: ev,
+      translucent: true,
+    });
+    return await popover.present(); */
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: ChatPopoverPage,
+      cssClass: 'model profile-modal search-submodal',
+      componentProps: {
+        roomId: this.roomId,
+      }
+    });
+    return await modal.present();
+  }
+
 
   /* async openOptions(ev: any) {
     const popover = await this.popoverController.create({
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index b2f8e9705..b8e86ee60 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -19,20 +19,22 @@
 </ion-header>
 
 <ion-content>
+  
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-refresher-content>
       </ion-refresher-content>
     </ion-refresher>
+
   <div class="main-content">
     
-    <ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="users" approxItemHeight="70px" [headerFn]="separateLetter">
   
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
       </div>
 
-      <div (click)="createRoom(user.username)" *virtualItem="let user" class="item-user">
+      <div (click)="openMessagesPage(user.username)" *virtualItem="let user" class="item-user">
          <p>{{user.name}}</p>
          <span class="icon">
           <ion-icon class="{{user.status}}" slot="end" name="ellipse"></ion-icon>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.scss b/src/app/shared/chat/messages/contacts/contacts.page.scss
index 1eb104bdb..24392c458 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.scss
+++ b/src/app/shared/chat/messages/contacts/contacts.page.scss
@@ -4,7 +4,7 @@
     --opacity: 1;
  
    .main-header{
-     width: 100%; /* 400px */
+     width: 100%;
      height: 100%;
      font-family: Roboto;
      border-top-left-radius: 25px;
@@ -27,7 +27,6 @@
        padding-left: 20px;
      }
        .title-content{
-         width: 360px;
          margin: 0px auto;
          overflow: auto;
          padding: 0 !important;
@@ -80,13 +79,13 @@
    --background:transparent;
  }
  .main-content{
-   width: 100%;
-   height: 100%;
-   font-family: Roboto;
-   margin: 0 auto;
-   background-color: #fff;
-   overflow:auto;
-   padding: 0 0 0 0;
+  width: 100%;
+  height: 100%;
+  font-family: Roboto;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 0 0 0 0;
+  overflow:auto;
  
      .item-divider{
        background: #ebebeb;
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index ff86e8d5b..d52746222 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Component, OnInit } from '@angular/core';
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -23,6 +23,8 @@ export class ContactsPage implements OnInit {
   room:any;
   dm:any;
 
+  @Output() openMessage:EventEmitter<any> = new EventEmitter<any>();
+
   constructor(
     private modalController: ModalController,
     private http: HttpClient,
@@ -46,6 +48,22 @@ export class ContactsPage implements OnInit {
     this.textSearch = event.detail.value;
   }
 
+  openMessagesPage(username:string){
+    if( window.innerWidth <= 1024){
+      this.createRoom(username);
+    }
+    else{
+      let body = {
+        username: username,
+      }
+      this.chatService.createRoom(body).subscribe(res => {
+        console.log(res);
+        this.room = res['room'];
+        this.openMessage.emit(this.room._id);
+      });
+    }
+  }
+
   loadUsers(){
     this.options = { 
       headers: this.headers,
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 2936836e6..0dda497cf 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -7,7 +7,7 @@
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
         <div class="right">
-          <ion-icon  (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
+          <ion-icon  (click)="_openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
       <div class="header-bottom" (click)="addContacts()">
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 44f4e928c..ad7536359 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1,10 +1,11 @@
 import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
-import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Status } from 'src/app/models/chat/status.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
+import { ProfileComponent } from '../../headers/header-no-search/profile/profile.component';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 
 @Component({
@@ -33,6 +34,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     /* private navParams: NavParams, */
     private chatService: ChatService,
     private authService: AuthService,
+    private animationController: AnimationController,
   ) { 
    /*  this.dm = this.navParams.get('dm'); */
   }
@@ -155,5 +157,56 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     return await popover.present();
   }
 
+
+
+  async _openMessagesOptions() {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+ 
+
+    /* const popover = await this.popoverController.create({
+      component: MessagesOptionsPage,
+      componentProps: {
+        roomId: this.dm._id,
+      },
+      cssClass: 'messages-options',
+      event: ev,
+      translucent: true,
+    });
+    return await popover.present(); */
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: MessagesOptionsPage,
+      cssClass: 'model profile-modal search-submodal',
+      componentProps: {
+        roomId: this.roomId,
+      }
+    });
+    return await modal.present();
+  }
+
 }
 
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html
index 4f109ee1a..49130161a 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.html
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.html
@@ -1,5 +1,15 @@
-<ion-content>
-  <ion-row>
+<ion-content class="container">
+  <div class="arrow-right">
+    <ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+  </div>
+  <div class="buttons">
+    <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
+    <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
+    <div class="solid"></div>
+    <button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
+    <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
+  </div>
+  <!-- <ion-row>
     <ion-col>
       <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
     </ion-col>
@@ -14,5 +24,5 @@
     <ion-col>
       <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
     </ion-col>
-  </ion-row>
+  </ion-row> -->
 </ion-content>
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss
index 0171ad1d0..67e991974 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.scss
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss
@@ -1,15 +1,53 @@
-ion-row{
-  padding: 10px 10px 5px 10px;
+.container{
+  --padding-top:20px !important;
+ --padding-bottom:20px !important;
+ --padding-start:20px !important;
+ --padding-end:20px !important;
 }
-.border-top{
-  padding-top: 5px !important;
-  border-top: 1px solid #ebebeb;
+.arrow-right{
+  display: none;
+  margin-bottom: 20px;
+  .arrow-right-icon{
+      width: 37px;
+      float: right;
+      font-size: 35px;
+      overflow: hidden;
+  }
+}
+.buttons{
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+}
+.solid {
+  display: none;
+  width: 90%;
+  border-top: 1px solid #bbb;
+  margin: 0 auto !important;
+}
+@media only screen and (min-width: 1024px) {
+  .arrow-right{
+      display: flex;
+      justify-content: flex-end;
+  }
+  .btn-cancel{
+      //display: none;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+  }
+  .btn-ok{
+    width: 100% !important;
+    margin-bottom: 10px !important;
+}
+  .btn-delete{
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      margin-top: 10px !important;
+  }
+  .solid{
+      display: block;
+  }
+  .mobile-only{
+    display: none !important;
+  }
 }
-/* ion-col{
-    border: 1px solid red;
-} */
-
-/* .btn-ok, .btn-cancel, .btn-delete{
-    font-size: 13px;
-    padding:0 !important;
-} */
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index ebf338bd6..cae809bb3 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -25,7 +25,12 @@ export class ChatPopoverPage implements OnInit {
     
   }
   close(){
-    this.popoverController.dismiss();
+    if( window.innerWidth <= 1024){
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
   }
 
    //Top menu options
diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html
index be9bcf347..9d8ac3b7d 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.html
+++ b/src/app/shared/popover/messages-options/messages-options.page.html
@@ -1,10 +1,10 @@
-<ion-content>
-  <ion-row class="border-top">
-    <ion-col>
-      <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
-    </ion-col>
-    <ion-col>
-      <button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
-    </ion-col>
-  </ion-row>
+<ion-content class="container">
+  <div class="arrow-right">
+    <ion-icon slot="end" class="arrow-right-icon" (click)="close()" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+  </div>
+  <div class="buttons">
+    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    <div class="solid"></div>
+    <button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
+  </div>
 </ion-content>
diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss
index 63122bda8..03fcefe0d 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.scss
+++ b/src/app/shared/popover/messages-options/messages-options.page.scss
@@ -1,3 +1,46 @@
-ion-row{
-    padding: 10px 10px 5px 10px;
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
+}
+.arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+}
+.buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+  }
+@media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        display: none;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+    }
+    .btn-delete{
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        margin-top: 10px !important;
+    }
+   /*  .solid{
+        display: block;
+    } */
 }
\ No newline at end of file
diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts
index 98ac52044..44262ee86 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.ts
+++ b/src/app/shared/popover/messages-options/messages-options.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { NavParams, PopoverController } from '@ionic/angular';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
 
 @Component({
@@ -13,6 +13,7 @@ export class MessagesOptionsPage implements OnInit {
 
   constructor(
     private popoverController: PopoverController,
+    private modalController: ModalController,
     private chatService: ChatService,
     private navParams: NavParams,
   ) 
@@ -24,7 +25,12 @@ export class MessagesOptionsPage implements OnInit {
   }
 
   close(){
-    this.popoverController.dismiss();
+    if( window.innerWidth <= 1024){
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
   }
 
   closeChatRoom(){
diff --git a/src/assets/icon/icons-arrow-arrow-left.svg b/src/assets/icon/icons-arrow-arrow-left.svg
new file mode 100644
index 000000000..4c329dbd3
--- /dev/null
+++ b/src/assets/icon/icons-arrow-arrow-left.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="35" viewBox="0 0 36 35">
+    <g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g stroke="#42B9FE" stroke-width="2">
+            <g>
+                <g>
+                    <path d="M22.629 9L13.371 18 22.629 27" transform="translate(-20 -124) translate(0 99) translate(20 25)"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/images/icons-arrow-arrow-right.svg b/src/assets/images/icons-arrow-arrow-right.svg
new file mode 100644
index 000000000..02f62df57
--- /dev/null
+++ b/src/assets/images/icons-arrow-arrow-right.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="35" viewBox="0 0 36 35">
+    <g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g stroke="#42B9FE" stroke-width="2">
+            <g>
+                <path d="M22.629 9L13.371 18 22.629 27" transform="translate(-968 -20) matrix(-1 0 0 1 1004 20)"/>
+            </g>
+        </g>
+    </g>
+</svg>

From 2c766015e7df0cacac5ea397b3a5eca149dc7d1d Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 18 Mar 2021 16:30:03 +0100
Subject: [PATCH 09/15] -style approve entents for desktop finished -style
 expedient  for desktop ongoing

---
 src/app/app-routing.module.ts                 |   8 ++
 src/app/pages/chat/chat.module.ts             |   2 +
 src/app/pages/chat/chat.page.html             |   5 +-
 src/app/pages/chat/chat.page.ts               |   9 +-
 .../gabinete-digital.module.ts                |  13 ++-
 .../gabinete-digital.page.html                |  21 ++--
 .../gabinete-digital.page.scss                |  26 ++++-
 .../gabinete-digital/gabinete-digital.page.ts |  31 +++++-
 .../chat/empty-chat/empty-chat.page.html      |   2 +-
 .../shared/chat/empty-chat/empty-chat.page.ts |   3 +-
 .../group-messages/group-messages.page.html   |   2 +-
 .../group-messages/group-messages.page.ts     |  59 ++++++++--
 .../shared/chat/messages/messages.page.html   |   4 +-
 src/app/shared/chat/messages/messages.page.ts |  63 +++++++++++
 .../empty-container-routing.module.ts         |  17 +++
 .../empty-container/empty-container.module.ts |  20 ++++
 .../empty-container/empty-container.page.html |   5 +
 .../empty-container/empty-container.page.scss |   5 +
 .../empty-container.page.spec.ts              |  24 ++++
 .../empty-container/empty-container.page.ts   |  16 +++
 .../events-to-approve-routing.module.ts       |  17 +++
 .../events-to-approve.module.ts               |  20 ++++
 .../events-to-approve.page.html               |  68 ++++++++++++
 .../events-to-approve.page.scss               |  92 ++++++++++++++++
 .../events-to-approve.page.spec.ts            |  24 ++++
 .../events-to-approve.page.ts                 | 104 ++++++++++++++++++
 .../expediente/expediente.page.html           |   2 +-
 .../chat-options-popover.page.html            |  18 ++-
 .../chat-options-popover.page.scss            |  71 +++++++-----
 .../chat-options-popover.page.ts              |  12 +-
 .../chat-popover/chat-popover.page.html       |  16 ---
 31 files changed, 685 insertions(+), 94 deletions(-)
 create mode 100644 src/app/shared/empty-container/empty-container-routing.module.ts
 create mode 100644 src/app/shared/empty-container/empty-container.module.ts
 create mode 100644 src/app/shared/empty-container/empty-container.page.html
 create mode 100644 src/app/shared/empty-container/empty-container.page.scss
 create mode 100644 src/app/shared/empty-container/empty-container.page.spec.ts
 create mode 100644 src/app/shared/empty-container/empty-container.page.ts
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts
 create mode 100644 src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 3dd13aae4..425f2122c 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -23,6 +23,14 @@ const routes: Routes = [
     path: 'btn-adicionar',
     loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
   },
+  {
+    path: 'empty-container',
+    loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
+  },
+  {
+    path: 'events-to-approve',
+    loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index 340239ee6..d3e4021b0 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -32,6 +32,7 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont
     GroupMessagesPage,
     NewGroupPage,
     GroupContactsPage,
+    EmptyChatPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   entryComponents: [
@@ -40,6 +41,7 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont
     GroupMessagesPage,
     NewGroupPage,
     GroupContactsPage,
+    EmptyChatPage,
   ]
 })
 export class ChatPageModule {}
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 445dc5297..427672943 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -87,10 +87,7 @@
       </div>
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">
-        <!-- <ion-button (click)="openMessagesPage()">Messages</ion-button>
-        <ion-button (click)="openGroupMessagesPage('MduvQyrQBejb3xMrY')">Groups</ion-button>
-        <ion-button (click)="destroyComponent()">Destroy</ion-button> -->
-        <app-empty-chat class="d-flex height-100" *ngIf="showEmptyComponent"></app-empty-chat>
+        <app-empty-chat [texto]="emptyTextDescription" class="d-flex height-100 flex-column" *ngIf="showEmptyComponent" #messagecontainer></app-empty-chat>
         <app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
         <app-contacts (openMessage)="openMessagesPage($event)" *ngIf="showContacts" class="d-flex height-100 flex-column"></app-contacts>
         <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index fc9d0e549..d97cbe1ef 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -64,9 +64,11 @@ export class ChatPage implements OnInit {
   showNewGroup=false;
   showGroupMessages=false;
   showGroupContacts=false;
+  emptyTextDescription = 'Sem conversa selecionada';
 
   @Output() getRoomInfo;
 
+
   constructor(
     private http:HttpClient,
     private chatService: ChatService,
@@ -80,11 +82,6 @@ export class ChatPage implements OnInit {
       /* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
       this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); */
     }
-    closeAllDesktopComponent(){
-      this.desktopComponent = {
-        showMessages: false,
-      }
-    }
   ngOnInit() {
     this.segment = "Contactos";
 
@@ -265,7 +262,7 @@ export class ChatPage implements OnInit {
     modal.onDidDismiss();
   }
   async openMessagesModal(roomId:any){
-    this.closeAllDesktopComponent();
+    this.closeAllDesktopComponents();
 
     let classs;
     if( window.innerWidth <= 1024){
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index c27f2256f..f8eb0f2d4 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -10,7 +10,9 @@ import { GabineteDigitalPage } from './gabinete-digital.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 
 import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component';
-import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'
+import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
+import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
+import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
 
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
@@ -25,7 +27,14 @@ import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/exped
   declarations: [
     GabineteDigitalPage,
     EventListComponent,
-    ExpedientePage
+    EmptyContainerPage,
+    EventsToApprovePage,
+    ExpedientePage,
+  ],
+  entryComponents: [
+    EmptyContainerPage,
+    EventsToApprovePage,
+    ExpedientePage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 8146870bd..8db7a198e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -8,15 +8,13 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content height-100">
+  <div class="main-content d-flex height-100">
 
-    <div class="d-flex height-100">
-
-      <!--  -->
-      <div class="d-flex aside-wrapper flex-column pt-25 justify-center width-md-40 ">
+      <!-- Aside left -->
+      <div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
         <p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
         <div class="aside overflow-y-auto d-flex d-md-block  flex-wrap justify-center width-100 px-20">
-          <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApproveList('MDGPR')">
+          <div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
             </div>
@@ -69,12 +67,11 @@
         </div>
       </div>
 
-      <!--  -->
-      <div class="d-none flex-1 aside-content height-100 overflow-y-auto pt-25">
-        <app-event-list class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showEventList"></app-event-list>
-        <app-expediente class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
+      <!-- Aside right -->
+      <div class="aside-content d-none flex-column height-100">
+        <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
+        <app-events-to-approve [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
+        <app-expediente [profile]="profile" class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
       </div>
-    </div>
-
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index c60877f91..8073fc452 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -107,7 +107,7 @@ ion-content{
   padding: 30px 5px 30px 5px;
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-  border: solid 1px #e9e9e9;
+  //border: solid 1px #e9e9e9;
   /* --background-color: #ffffff !important; */
   background-color: #ffffff !important;
   float: left;
@@ -153,8 +153,9 @@ ion-content{
 
   .main-content{
     .aside-wrapper{
-      border: 1px solid red;
+      width: 40%;
       justify-content: flex-start !important;
+      border-right: 1px solid #d8d8d8;
       .aside-title{
         font-family: Roboto;
         font-size: 25px;
@@ -162,25 +163,38 @@ ion-content{
       }
     }
     .aside-content{
+      width: 60%;
       display: flex !important;
       background-color: white;
     }
   }
 
   .exp-card{
-    margin: 5px auto;
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    margin-bottom: 15px;
     flex-direction: row !important;
     width: 100%;
-    padding-right: 11px;
-    padding-bottom: 5px;
-    padding-top: 5px;
+    padding: 10px 17px 10px 17px;
     height: unset !important;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+
     .exp-card-title{
       flex: 1;
       text-align: left;
+      margin-top: 0px !important;
+    }
+    .exp-card-content{
+      margin: 0 !important;
     }
     .exp-card-content .title1{
       display: none;
+      margin-top: 0px !important;
+    }
+    .exp-card-content .number{
+      //display: none;
+      margin-top: 0px !important;
     }
   } 
 }
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index cc9e51ebc..7c3e2a02f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -31,6 +31,10 @@ export class GabineteDigitalPage implements OnInit {
     showEventList: false,
     showExpediente : false
   }
+  showEventsToApprove = true;
+  showEmptyContainer = false;
+  showExpedients = false;
+  emptyTextDescription = 'Sem opção selecionada';
 
   constructor(
     private processesbackend:ProcessesService,
@@ -90,6 +94,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{
 });
   }
 
+  closeAllDesktopComponents(){
+    this.showEmptyContainer = false;
+    this.showEventsToApprove = false;
+    this.showExpedients = false;
+    this.showExpedients = false;
+  }
+
   LoadCounts() {
     this.showLoader = true;
     this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{
@@ -122,6 +133,16 @@ this.processesbackend.GetActionsList().subscribe(res=>{
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
+
+  openEventsToApprovePage(segment:any){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      this.openEventsToApproveList(segment);
+    }
+    else{
+      this.showEventsToApprove = true;
+    }
+  }
   
   async openEventsToApproveList(segment:any){
     
@@ -151,7 +172,15 @@ this.processesbackend.GetActionsList().subscribe(res=>{
     //}
 
   }
-
+  openExpedientListPage(){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      this.openExpedientList();
+    }
+    else{
+      this.showExpedients = true;
+    }
+  }
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.html b/src/app/shared/chat/empty-chat/empty-chat.page.html
index b5514095a..1d2bf5d00 100644
--- a/src/app/shared/chat/empty-chat/empty-chat.page.html
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.html
@@ -1,5 +1,5 @@
 <ion-content>
   <div class="center height-100">
-    <p>Sem conversa selecionada</p>
+    <p>{{texto}}</p>
   </div>
 </ion-content>
diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.ts b/src/app/shared/chat/empty-chat/empty-chat.page.ts
index fff63b39d..c22d2189c 100644
--- a/src/app/shared/chat/empty-chat/empty-chat.page.ts
+++ b/src/app/shared/chat/empty-chat/empty-chat.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-empty-chat',
@@ -6,6 +6,7 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./empty-chat.page.scss'],
 })
 export class EmptyChatPage implements OnInit {
+  @Input() texto:string;
 
   constructor() { }
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index c5971d016..789262d29 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -55,7 +55,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <ion-icon (click)="openSendGroupMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 7e3823775..3f5445438 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -187,8 +187,19 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     return await modal.present();
   }
 
+  openSendGroupMessageOptions(ev: any){
+    if(window.innerWidth <= 1024){
+      console.log('mobile');
+      this.openChatOptions(ev);
+    }
+    else{
+      console.log('desktop');
+      this._openChatOptions();
+    }
+  }
 
-  /* async openOptions(ev: any) {
+
+  async openOptions(ev: any) {
     const popover = await this.popoverController.create({
       component: ChatPopoverPage,
       cssClass: 'chat-popover',
@@ -202,10 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     popover.onDidDismiss().then(res=>{
       console.log(res);
       if(res.data){
-        this.roomName = res.data.name.split('-').join(' ');
-        console.log(this.roomName);
-        
-        this.load();
+        this.getRoomInfo();
         //this.modalController.dismiss(); 
       };
       
@@ -241,10 +249,10 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     await modal.present();
 
     modal.onDidDismiss().then(()=>{
-      this.load();
+      this.getRoomInfo();
     });
   }
- */
+
   /* async actionSheet() {
     const actionSheet = await this.actionSheetController.create({
       cssClass: 'my-custom-class',
@@ -271,5 +279,42 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   }
  */
 
+  async _openChatOptions() {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: ChatOptionsPopoverPage,
+      cssClass: 'model profile-modal search-submodal',
+      componentProps: {
+        roomId: this.roomId,
+      }
+    });
+    return await modal.present();
+  }
+
 }
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 0dda497cf..9ac6880fb 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -10,7 +10,7 @@
           <ion-icon  (click)="_openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
         </div>  
       </div>
-      <div class="header-bottom" (click)="addContacts()">
+      <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
           <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
         </div>
@@ -48,7 +48,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <ion-icon (click)="openChatOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
+      <ion-icon (click)="openSendMessageOptions()" class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index ad7536359..034a50225 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -147,6 +147,17 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     modal.onDidDismiss();
   }
 
+  openSendMessageOptions(ev:any){
+    if(window.innerWidth <= 1024){
+      console.log('mobile');
+      this.openChatOptions(ev);
+    }
+    else{
+      console.log('desktop');
+      this._openChatOptions();
+    }
+  }
+
   async openChatOptions(ev: any) {
     const popover = await this.popoverController.create({
       component: ChatOptionsPopoverPage,
@@ -208,5 +219,57 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     return await modal.present();
   }
 
+  
+
+  async _openChatOptions() {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+ 
+
+    /* const popover = await this.popoverController.create({
+      component: MessagesOptionsPage,
+      componentProps: {
+        roomId: this.dm._id,
+      },
+      cssClass: 'messages-options',
+      event: ev,
+      translucent: true,
+    });
+    return await popover.present(); */
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: ChatOptionsPopoverPage,
+      cssClass: 'model profile-modal search-submodal',
+      componentProps: {
+        roomId: this.roomId,
+      }
+    });
+    return await modal.present();
+  }
+
+
 }
 
diff --git a/src/app/shared/empty-container/empty-container-routing.module.ts b/src/app/shared/empty-container/empty-container-routing.module.ts
new file mode 100644
index 000000000..74342e513
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EmptyContainerPage } from './empty-container.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EmptyContainerPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EmptyContainerPageRoutingModule {}
diff --git a/src/app/shared/empty-container/empty-container.module.ts b/src/app/shared/empty-container/empty-container.module.ts
new file mode 100644
index 000000000..ccf4cef7a
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EmptyContainerPageRoutingModule } from './empty-container-routing.module';
+
+import { EmptyContainerPage } from './empty-container.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EmptyContainerPageRoutingModule
+  ],
+  declarations: [EmptyContainerPage]
+})
+export class EmptyContainerPageModule {}
diff --git a/src/app/shared/empty-container/empty-container.page.html b/src/app/shared/empty-container/empty-container.page.html
new file mode 100644
index 000000000..1d2bf5d00
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container.page.html
@@ -0,0 +1,5 @@
+<ion-content>
+  <div class="center height-100">
+    <p>{{texto}}</p>
+  </div>
+</ion-content>
diff --git a/src/app/shared/empty-container/empty-container.page.scss b/src/app/shared/empty-container/empty-container.page.scss
new file mode 100644
index 000000000..6483b8c01
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container.page.scss
@@ -0,0 +1,5 @@
+.center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
\ No newline at end of file
diff --git a/src/app/shared/empty-container/empty-container.page.spec.ts b/src/app/shared/empty-container/empty-container.page.spec.ts
new file mode 100644
index 000000000..a45f31369
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EmptyContainerPage } from './empty-container.page';
+
+describe('EmptyContainerPage', () => {
+  let component: EmptyContainerPage;
+  let fixture: ComponentFixture<EmptyContainerPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EmptyContainerPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EmptyContainerPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/empty-container/empty-container.page.ts b/src/app/shared/empty-container/empty-container.page.ts
new file mode 100644
index 000000000..e3a933416
--- /dev/null
+++ b/src/app/shared/empty-container/empty-container.page.ts
@@ -0,0 +1,16 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-empty-container',
+  templateUrl: './empty-container.page.html',
+  styleUrls: ['./empty-container.page.scss'],
+})
+export class EmptyContainerPage implements OnInit {
+  @Input() texto:string;
+  
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts
new file mode 100644
index 000000000..8b740ddb4
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EventsToApprovePage } from './events-to-approve.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EventsToApprovePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EventsToApprovePageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts
new file mode 100644
index 000000000..4d4108c91
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EventsToApprovePageRoutingModule } from './events-to-approve-routing.module';
+
+import { EventsToApprovePage } from './events-to-approve.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EventsToApprovePageRoutingModule
+  ],
+  declarations: [EventsToApprovePage]
+})
+export class EventsToApprovePageModule {}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
new file mode 100644
index 000000000..fc7a502b1
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -0,0 +1,68 @@
+<ion-content>
+  <div class="title width-100">
+    <label>Eventos para Aprovação</label>
+    <ion-toolbar>
+      <ion-segment [(ngModel)]="segment">
+        <ion-segment-button value="MDGPR">
+          Seu calendário
+        </ion-segment-button>
+        <ion-segment-button value="PR">
+          Presidente da República
+        </ion-segment-button>
+      </ion-segment>
+    </ion-toolbar>
+   </div>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+     <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+  <div [ngSwitch]="segment">
+   <!--  <div class="header-content width-100"> -->
+     
+  <!-- </div> --> 
+    <ion-list class="width-100" *ngSwitchCase="'MDGPR'">
+      <div class="width-100" *ngIf="eventsMDGPRList">
+        <ion-list>
+          <ion-item-sliding>
+            <ion-item class="Rectangle width-100" lines="none" 
+              *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              
+              <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
+                <div class="approve-event-time">
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+          </ion-item-sliding>
+        </ion-list>
+      </div>
+    </ion-list>
+    <ion-list *ngSwitchCase="'PR'">
+      <div *ngIf="eventsPRList">
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
+              <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}}">
+                <div class="approve-event-time">
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
+    </ion-list>
+  </div>
+</ion-content>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
new file mode 100644
index 000000000..de66908ef
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -0,0 +1,92 @@
+:host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+}
+.title{
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+  }
+  ion-item-sliding{
+    margin-top: 5px;
+  }
+  .Rectangle {
+    //width: 360px;
+    border-radius: 15px;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    border: solid 1px #e9e9e9;
+    background-color: var(--white);
+    margin: 0 auto;
+    padding: 10px;
+    margin-bottom: 10px;
+    overflow: auto;
+  }
+  .content-mdgpr-Oficial{
+    border-radius: 5px;
+    border-right: 5px solid #99e47b;
+    overflow: auto;
+  }
+  .content-mdgpr-Pessoal{
+    border-radius: 5px;
+    border-right: 5px solid #958bfc;
+    overflow: auto;
+  }
+  .content-pr-Oficial{
+    border-radius: 5px;
+    border-right: 5px solid #ffb703;
+    overflow: auto;
+  }
+  .content-pr-Pessoal{
+    border-radius: 5px;
+    border-right: 5px solid #f05d5e;
+    overflow: auto;
+  }
+  
+  .approve-event-time{
+    float: left;
+  }
+  .approve-event-time p{
+    width: 33px;
+    font-family: Roboto;
+    font-size: 13px;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: var(--Antartic-grey);
+    margin: 0;
+    padding: 0;
+  }
+  .approve-event-detail{
+    float: left;
+    margin-left: 10px;
+  }
+  .approve-event-detail p{
+    width: 250px;
+    font-family: Roboto;
+    font-size: 13px;
+    font-weight: normal;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: var(--black);
+    margin: 0;
+    padding: 0;
+  }
+  .approve-event-detail h3{
+    width: 250px;
+    font-family: Roboto;
+    font-size: 15px;
+    font-weight: bold;
+    font-stretch: normal;
+    font-style: normal;
+    line-height: normal;
+    letter-spacing: normal;
+    color: #0d89d1;
+    margin: 0;
+    padding: 0;
+  }
+  
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts
new file mode 100644
index 000000000..a7e54d0a1
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EventsToApprovePage } from './events-to-approve.page';
+
+describe('EventsToApprovePage', () => {
+  let component: EventsToApprovePage;
+  let fixture: ComponentFixture<EventsToApprovePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EventsToApprovePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EventsToApprovePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
new file mode 100644
index 000000000..93fef7c8f
--- /dev/null
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -0,0 +1,104 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { EventBody } from 'src/app/models/eventbody.model';
+import { EventPerson } from 'src/app/models/eventperson.model';
+import { Event } from 'src/app/models/event.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController, NavParams } from '@ionic/angular';
+import { NavigationEnd, Router } from '@angular/router';
+import { ApproveEventModalPage } from 'src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
+
+@Component({
+  selector: 'app-events-to-approve',
+  templateUrl: './events-to-approve.page.html',
+  styleUrls: ['./events-to-approve.page.scss'],
+})
+export class EventsToApprovePage implements OnInit {
+
+  //segment:string;
+  showLoader: boolean;
+  eventsPRList: any;
+  eventsMDGPRList: any;
+  eventPerson: EventPerson;
+  eventBody: EventBody;
+  categories: string[];
+  serialnumber:string;
+
+  @Input() segment:string;
+
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    private router: Router,
+    //private navParams: NavParams,
+    ) { }
+S
+  ngOnInit() {
+    //this.segment = this.navParams.get('segment');
+    /* console.log(this.navParams.get('md')); */
+    console.log(this.segment);
+    this.LoadToApproveEvents();
+    
+
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadToApproveEvents();
+      }
+    });
+
+    window.onresize = (event) => {
+      // if not mobile remove all component
+      if( window.innerWidth <= 1024){
+        this.modalController.dismiss();
+      }
+    };
+
+  }
+
+  LoadToApproveEvents(){
+    this.showLoader = true;
+    
+    this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
+      this.showLoader = false;
+      this.eventsPRList = res;
+    });
+    this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
+      this.showLoader = false;
+      this.eventsMDGPRList = res;
+    });
+  }
+  async openApproveModal(eventSerialNumber){
+
+
+    let classs;
+    if( window.innerWidth <= 1024){
+      classs = 'cal-modal  modal modal-desktop'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ApproveEventModalPage,
+      componentProps:{
+        serialNumber: eventSerialNumber,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss();
+  }
+  doRefresh(event) {
+    this.LoadToApproveEvents();
+    console.log('refresh');
+    setTimeout(() => {
+       event.target.complete();
+     }, 2000);
+  }
+  close(){
+    this.modalController.dismiss(null);
+  }
+
+
+}
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.html b/src/app/shared/gabinete-digital/expediente/expediente.page.html
index 91feec0b9..92952c2d0 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.html
@@ -4,7 +4,7 @@
       <div class="title-content">
         <app-btn-modal-dismiss></app-btn-modal-dismiss>
         <div class="middle">
-          <ion-label class="title">Gabinete Digital</ion-label>
+          <ion-label class="title">11Gabinete Digital</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index ebd9a9c01..63aa6619e 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -1,5 +1,17 @@
-<ion-content>
-  <ion-row>
+<ion-content class="container">
+  <div class="arrow-right">
+    <ion-icon (click)="close()" slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
+  </div>
+  <div class="buttons">
+    <button full class="btn-ok" shape="round" >Tirar Fotografia</button>
+    <button class="btn-ok" shape="round" >Digitalizar Documento</button>
+    <button full class="btn-ok" shape="round" >Anexar Fotografia</button>
+    <button class="btn-ok" shape="round" >Anexar Documento</button>
+    <div class="solid"></div>
+    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+  </div>
+
+  <!-- <ion-row>
     <ion-col>
       <button full class="btn-ok" shape="round" >Tirar Fotografia</button>
     </ion-col>
@@ -19,5 +31,5 @@
     </ion-col>
     <ion-col>
     </ion-col>
-  </ion-row>
+  </ion-row> -->
 </ion-content>
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
index 1e44f4b3d..b3105a989 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
@@ -1,32 +1,47 @@
-ion-row{
-    padding: 10px 10px 5px 10px;
-}
-.border-top{
-    padding-top: 5px !important;
-    border-top: 1px solid #ebebeb;
-}
-/* ion-col{
-    border: 1px solid red;
-} */
-.btn-cancel{
-    display: block;
-    width: 170px !important;
-    height: 45px !important;
-    border-radius: 22.5px;
-    background-color:  #e0e9ee;
-    --color: #061b52 !important;
-    --background:transparent;
-    --box-shadow: none;
-    margin: 0 auto !important;
+.container{
+    --padding-top:20px !important;
+   --padding-bottom:20px !important;
+   --padding-start:20px !important;
+   --padding-end:20px !important;
   }
+  .arrow-right{
+    display: none;
+    margin-bottom: 20px;
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
 
-.btn-ok{
-    display: block;
-    width: 170px !important;
-    height: 45px !important;
-    border-radius: 22.5px;
-    --background: #42b9fe;
-    --color: #ffffff !important;
+    .btn-ok, .btn-cancel, .btn-delete{
+        margin-bottom: 10px !important;
+    }
+  }
+  .solid {
+    display: none;
+    width: 90%;
+    border-top: 1px solid #bbb;
     margin: 0 auto !important;
-
+    margin-bottom: 10px;
+  }
+  @media only screen and (min-width: 1024px) {
+    .arrow-right{
+        display: flex;
+        justify-content: flex-end;
+    }
+    .btn-cancel{
+        display: none;
+    }
+    .btn-ok{
+      width: 100% !important;
+  }
+    .mobile-only{
+      display: none !important;
+    }
   }
\ No newline at end of file
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index 283b273a0..1958349dd 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 
 @Component({
   selector: 'app-chat-options-popover',
@@ -9,14 +9,20 @@ import { PopoverController } from '@ionic/angular';
 export class ChatOptionsPopoverPage implements OnInit {
 
   constructor(
-    private popoverController: PopoverController
+    private popoverController: PopoverController,
+    private modalController: ModalController,
   ) { }
 
   ngOnInit() {
   }
 
   close(){
-    this.popoverController.dismiss();
+    if( window.innerWidth <= 1024){
+      this.popoverController.dismiss();
+    }
+    else{
+      this.modalController.dismiss();
+    }
   }
 
 }
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html
index 49130161a..8e3e94859 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.html
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.html
@@ -9,20 +9,4 @@
     <button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
     <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
   </div>
-  <!-- <ion-row>
-    <ion-col>
-      <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
-    </ion-col>
-    <ion-col>
-      <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
-    </ion-col>
-  </ion-row>
-  <ion-row class="border-top">
-    <ion-col>
-      <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
-    </ion-col>
-    <ion-col>
-      <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
-    </ion-col>
-  </ion-row> -->
 </ion-content>

From 46e954794f8be30a3e5ac725fb5e91c41f2a32b5 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 18 Mar 2021 23:37:03 +0100
Subject: [PATCH 10/15] style expedient list

---
 src/app/app-routing.module.ts                 |   4 +
 src/app/pages/events/events.page.html         |   2 +-
 .../gabinete-digital.module.ts                |   3 +
 .../gabinete-digital.page.html                |   4 +-
 .../gabinete-digital/gabinete-digital.page.ts |   4 +-
 .../expediente/expediente.page.ts             |   6 +-
 .../expedients/expedients-routing.module.ts   |  17 ++
 .../expedients/expedients.module.ts           |  20 +++
 .../expedients/expedients.page.html           |  86 +++++++++
 .../expedients/expedients.page.scss           | 169 ++++++++++++++++++
 .../expedients/expedients.page.spec.ts        |  24 +++
 .../expedients/expedients.page.ts             |  94 ++++++++++
 src/theme/variables.scss                      |   1 -
 13 files changed, 426 insertions(+), 8 deletions(-)
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients-routing.module.ts
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients.module.ts
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients.page.html
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients.page.scss
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients.page.spec.ts
 create mode 100644 src/app/shared/gabinete-digital/expedients/expedients.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 425f2122c..2d637573b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -31,6 +31,10 @@ const routes: Routes = [
     path: 'events-to-approve',
     loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
   },
+  {
+    path: 'expedients',
+    loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index b75a20e64..9f435f677 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -58,7 +58,7 @@
            <!-- (click)="viewEventDetail(event.EventId)" -->
           <ul>
             <li *ngFor="let event of eventsList"
-            [routerLink]="['/home/events', event.EventId, 'events']"
+            (click)="viewEventDetail(event.EventId)"
             >
             <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
               <div class="schedule-time">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index f8eb0f2d4..6eca51583 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -13,6 +13,7 @@ import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.
 import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
 import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
 import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
+import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
 
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
@@ -30,11 +31,13 @@ import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/exped
     EmptyContainerPage,
     EventsToApprovePage,
     ExpedientePage,
+    ExpedientsPage,
   ],
   entryComponents: [
     EmptyContainerPage,
     EventsToApprovePage,
     ExpedientePage,
+    ExpedientsPage,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 8db7a198e..3f3d8b37b 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -21,7 +21,7 @@
             <p class="text-center exp-card-title ">Eventos para Aprovação</p>
             <p class="text-center exp-card-content">{{count_ev_md+count_ev_pr}} <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex flex-column justify-center" (click)="openExpedientList()">
+          <div class="exp-card d-flex flex-column justify-center" (click)="openExpedientListPage()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-correspondencia.svg"></ion-icon>
             </div>
@@ -71,7 +71,7 @@
       <div class="aside-content d-none flex-column height-100">
         <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
         <app-events-to-approve [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
-        <app-expediente [profile]="profile" class="d-flex flex-1 flex-column height-100" *ngIf="desktopComponent.showExpediente"></app-expediente>
+        <app-expedients [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 7c3e2a02f..259bd8ab1 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -31,9 +31,9 @@ export class GabineteDigitalPage implements OnInit {
     showEventList: false,
     showExpediente : false
   }
-  showEventsToApprove = true;
+  showEventsToApprove = false;
   showEmptyContainer = false;
-  showExpedients = false;
+  showExpedients = true;
   emptyTextDescription = 'Sem opção selecionada';
 
   constructor(
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.ts b/src/app/shared/gabinete-digital/expediente/expediente.page.ts
index 867834f3c..8de6c53b6 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
@@ -17,13 +17,15 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/
 export class ExpedientePage implements OnInit {
 
   segment:string;
-  profile:string;
+  //profile:string;
 
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
   serialNumber:string;
 
+  @Input() profile:string;
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
diff --git a/src/app/shared/gabinete-digital/expedients/expedients-routing.module.ts b/src/app/shared/gabinete-digital/expedients/expedients-routing.module.ts
new file mode 100644
index 000000000..d5c5b384e
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ExpedientsPage } from './expedients.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ExpedientsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ExpedientsPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.module.ts b/src/app/shared/gabinete-digital/expedients/expedients.module.ts
new file mode 100644
index 000000000..b6f5415c5
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ExpedientsPageRoutingModule } from './expedients-routing.module';
+
+import { ExpedientsPage } from './expedients.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ExpedientsPageRoutingModule
+  ],
+  declarations: [ExpedientsPage]
+})
+export class ExpedientsPageModule {}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
new file mode 100644
index 000000000..ac92756fd
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -0,0 +1,86 @@
+<ion-header class="ion-no-border">
+  <div class="title">
+    <ion-label >Correspondencia</ion-label>
+  </div>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment">
+      <ion-segment-button value="expediente">
+        Expediente
+      </ion-segment-button>
+      <ion-segment-button value="pendentes">
+        Pendentes
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-header>
+<ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+      </ion-refresher-content>
+    </ion-refresher>
+  
+  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
+    <ion-list *ngSwitchCase="'expediente'">
+      <ion-item 
+          class="expediente ion-no-padding"  
+          *ngFor = "let task of taskslist"
+          (click)="viewExpedientDetail(task.SerialNumber)"
+          >
+          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                </div>
+                <div class="exp-remetente">
+                  <ion-label>{{task.Remetente}}</ion-label>
+                </div>
+                <div class="exp-icon">
+                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <label></label>
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+            </div>
+          </ion-item>
+    </ion-list>
+    <ion-list *ngSwitchCase="'pendentes'">
+      <ion-item-group>
+        <ion-item-sliding>
+        </ion-item-sliding>
+      </ion-item-group>
+    </ion-list>
+  </div>
+  <div *ngIf="!taskslist">
+  
+    <ion-list>
+      <ion-item>
+        <ion-thumbnail slot="end">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-thumbnail slot="end">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  </div>
+</ion-content>
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
new file mode 100644
index 000000000..6e5e17b43
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
@@ -0,0 +1,169 @@
+@import '~src/function.scss';
+/* CONTENT */
+:host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+}
+.title{
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: auto;
+  }
+  .ion-item-class{
+    padding: 0;
+  
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //border-radius: 15px;
+    //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    //Sborder: solid 1px #e9e9e9;
+    background-color: var(--white);
+    margin: 0 auto;
+    padding: 10px;
+    margin-bottom: 10px;
+    overflow: auto;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  padding:5px 5px 15px 5px;
+  margin: 10px 0 10px 0;
+  background:  #dae3f3;
+  border-radius: 20px;
+}
+.div-content-pendentes{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #d9d9d9;
+  padding: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+  
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      /* border: 1px solid red; */
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    /* border: 1px solid blue; */
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+/* New CSS */
+.expediente{
+  padding-top: 10px;
+}
+.exp-list-item{
+  width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+.exp-top-detail{
+  width: 100%;
+  overflow: auto;
+}
+.exp-date{
+  width: auto;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: #797979;
+  float: left;
+}
+.exp-remetente{
+  width: 200px;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  color: #000000;
+  float: left;
+  margin-left: 16px;
+
+}
+.exp-icon{
+  width: 45px;
+  float: right;
+  font-size: 13px;
+}
+.exp-icon ion-icon{
+  font-size: 25px;
+  color: #42b9fe;
+}
+.exp-bottom-detail{
+  width: 100px;
+  float: left;
+  font-family: Roboto;
+  font-size: 16px;
+  font-weight: 700;
+  color: #0d89d1;
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.spec.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.spec.ts
new file mode 100644
index 000000000..0d73188e6
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ExpedientsPage } from './expedients.page';
+
+describe('ExpedientsPage', () => {
+  let component: ExpedientsPage;
+  let fixture: ComponentFixture<ExpedientsPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ExpedientsPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ExpedientsPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
new file mode 100644
index 000000000..00dd8602a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -0,0 +1,94 @@
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { CalendarComponent } from 'ionic2-calendar';
+
+import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { formatDate } from '@angular/common';
+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';
+
+@Component({
+  selector: 'app-expedients',
+  templateUrl: './expedients.page.html',
+  styleUrls: ['./expedients.page.scss'],
+})
+export class ExpedientsPage implements OnInit {
+  segment:string;
+  //profile:string;
+
+  @ViewChild(CalendarComponent) myCal: CalendarComponent;
+
+  taskslist:DailyWorkTask[];
+  serialNumber:string;
+
+  @Input() profile:string;
+
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    ) { 
+      this.profile = 'mdgpr';
+    }
+
+  ngOnInit() {
+    //Inicializar segment
+    this.segment = "expediente";
+    this.LoadList();
+  }
+
+  LoadList()
+  {
+    this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      this.taskslist = new Array();
+      result.forEach(element => {
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceFolio,
+          "Senders": element.originator.email,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": element.workflowInstanceDataFields.Remetente
+        }
+        this.taskslist.push(task);
+      });
+    });
+  }
+
+  doRefresh(event) {
+    this.LoadList();
+
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
+
+  async viewExpedientDetail(serialNumber:any) {
+    console.log(this.profile);
+
+    let classs;
+    if( window.innerWidth <= 1024){
+      classs = 'modal'
+    } else  {
+      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        enterAnimation: "",
+        serialNumber: serialNumber,
+        profile: this.profile,
+      },
+      cssClass: classs,
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      
+    });
+  }
+
+}
+  
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ec813d5f5..950cf7c8d 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -312,7 +312,6 @@
 /* .event-actions-popover ion-list{
 } */
 .Rectangle {
-  width: 360px;
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border: solid 1px #e9e9e9;

From d836b09ecce4aecff4d58224bc9801ac8bcdd7da Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 19 Mar 2021 19:18:24 +0100
Subject: [PATCH 11/15] style expedient detail for desktop

---
 src/app/home/home.page.html                   |   2 +-
 .../expediente-detail.page.html               | 322 ++++++++----------
 .../expediente-detail.page.scss               | 280 +++++++--------
 .../expediente/expediente.page.ts             |   2 -
 .../gabinete-digital.page.html                |   5 +-
 .../gabinete-digital/gabinete-digital.page.ts |  20 +-
 .../events-to-approve.page.scss               |   6 +-
 .../expediente/expediente.page.html           | 279 ++++++++++-----
 .../expediente/expediente.page.scss           | 248 +++++++-------
 .../expediente/expediente.page.ts             | 191 +++++++----
 .../expedients/expedients.page.html           |   2 +-
 .../expedients/expedients.page.scss           |   7 +-
 .../expedients/expedients.page.ts             |  13 +-
 13 files changed, 766 insertions(+), 611 deletions(-)

diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 7aa44c00e..edb7dd2a0 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -22,7 +22,7 @@
         </ion-tab-button>
         <ion-tab-button tab="publications">
           <ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
-          <ion-label>Ações</ion-label>
+          <ion-label>Acções</ion-label>
         </ion-tab-button>
         <ion-tab-button tab="chat">
           <ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 0cc58df91..0a2089f60 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -1,10 +1,10 @@
-<ion-header  class="ion-no-border">
+<ion-header hidden  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
         <app-btn-modal-dismiss></app-btn-modal-dismiss>
         <div class="middle">
-          <ion-label class="title">Detalhes do Expediente</ion-label>
+          <ion-label class="title">{{ task.Folio}}</ion-label>
         </div>
         <div class="div-icon">
             <ion-menu-button autoHide="false">
@@ -15,21 +15,8 @@
     </div>
   </ion-toolbar>
 </ion-header>
-<!-- <ion-header>
-  <ion-toolbar class="bg-blue">
-    <ion-buttons slot="start">
-      <ion-back-button defaultHref="/expediente"></ion-back-button>
-    </ion-buttons>
-    <ion-title>Expediente</ion-title>
-    <ion-buttons slot="end">
-      <ion-menu-button autoHide="false">
-        <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header> -->
 
-<ion-menu autoHide="false" side="end" content-id="main-content">
+<!-- <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
       <ion-title>Menu</ion-title>
@@ -63,177 +50,152 @@
       </ion-item>
     </ion-list>
   </ion-content>
-</ion-menu>
-<div class="ion-page" id="main-content">
+</ion-menu> -->
+<!-- <div class="ion-page" id="main-content">
   <ion-menu-button></ion-menu-button>
-</div>
+</div> -->
 
-<ion-content  padding>
-  <div *ngIf="task">
-  <h3 class="h3-event-title">Detalhes do Expediente</h3>
-  <ion-item-group>
-    <ion-item>
-      <ion-label position="stacked">Assunto</ion-label>
-      <ion-input disabled="true">{{ task.Folio }}</ion-input>
-    </ion-item>
-    <ion-item>
-      <ion-label position="stacked">Remetentes</ion-label>
-      <ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
-    </ion-item>
-    <ion-item>
-      <ion-label position="stacked">Data</ion-label>
-      <ion-input disabled="true" value=''>{{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}}</ion-input>
-    </ion-item>
-    <ion-button (click)="viewDocument()" class="btn-ok-no-width" fill="clear" color="#fff" shape="round" expand="block">
-      <ion-icon name="attach" slot="start"></ion-icon>
-      Ver documento
-    </ion-button>
-  </ion-item-group>
-    <div *ngIf="eventsList">
-      <h3 class="h3-event-title">Eventos Associados</h3>
-    <!-- <ion-list>
-        <ion-item-sliding>
-          <ion-item lines="none" 
-          *ngFor="let event of eventsList"
-          [routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
-            <div class="div-item-{{event.CalendarName}}">
-              <div class="div-up">
-                <div class="div-icon">
-                  <ion-icon slot="start" name="reader"></ion-icon>
-                </div>
-                <div class="div-content-{{event.CalendarName}}">
-                  <h3 class="capitalizeText">{{event.Subject}}</h3>
-                  <p>{{event.StartDate | date: 'dd-MM-yy | hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
-                </div>
-              </div>
-              <div class="div-botton">
-                <div class="div-botton-left">
-                  <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
-                </div>
-                <div class="div-botton-middle">
-                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
-                </div>
-                <div *ngIf="event.HasAttachments" class="div-botton-right">
-                  <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
-                </div>
-              </div>
-            </div>
-          </ion-item>
-        </ion-item-sliding>
-    </ion-list> -->
+<ion-content class="height-100">
+  <div class="main-content d-flex height-100">
+    <div class="content d-flex flex-column" *ngIf="task">
 
-    <ion-list>
-      <div *ngIf="eventsList">
-        <ion-item-sliding>
-          <ion-item 
-            class="Rectangle" lines="none" 
-            *ngFor="let event of eventsList"
-            (click)="viewEventDetail(event.EventId)"
-          >
-              <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
-              <div class="content-{{profile}}-{{event.CalendarName}}">
-                <div class="approve-event-time">
-                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                </div>
-                <div class="approve-event-detail">
-                  <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
-                  <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
-                  <h3>{{event.Subject}}</h3>
-                </div>
-              </div>
-            </ion-item>
-        </ion-item-sliding>
+      <div class="main-header">
+        <div class="title-content">
+          <app-btn-modal-dismiss></app-btn-modal-dismiss>
+          <div class="middle">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon">
+              <ion-menu-button autoHide="false">
+                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+              </ion-menu-button>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">Sexta, 14 de Abril</span><span class="label">Expediente</span></p>
+            <p><span class="color-red">Muitíssimo urgente</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="middle-content">
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <h3>Intervenientes</h3>
+            <div>
+              <p>Tiago Kayaya</p>
+              <p>Tiago Kayaya</p>
+            </div>
+          </ion-label>
+        </ion-item>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <h3>Detalhes</h3>
+            <p>MINEC, MINFIN</p>
+          </ion-label>
+        </ion-item>
+      </div>
+      <div class="bottom-content width-100">
+        <ion-list>
+          <h3>Documentos Anexados</h3>
+          <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label
+          (click)="viewDocument()">
+            <p class="attach-title-item">{{ task.Folio }}</p>
+            <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
+          </ion-label>
+        </ion-item>
+        </ion-list>
       </div>
-    </ion-list>
 
+      <div *ngIf="eventsList">
+        <h3 class="h3-event-title">Eventos Associados</h3>
+        <ion-list>
+          <div *ngIf="eventsList">
+            <ion-item-sliding>
+              <ion-item 
+                class="Rectangle" lines="none" 
+                *ngFor="let event of eventsList"
+                (click)="viewEventDetail(event.EventId)"
+              >
+                  <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
+                  <div class="content-{{profile}}-{{event.CalendarName}}">
+                    <div class="approve-event-time">
+                      <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                      <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                    </div>
+                    <div class="approve-event-detail">
+                      <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
+                      <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
+                      <h3>{{event.Subject}}</h3>
+                    </div>
+                  </div>
+                </ion-item>
+            </ion-item-sliding>
+          </div>
+        </ion-list>
+      </div>
 
-  </div>
-  <!-- <div *ngIf="!eventsList"> 
-    <ion-list>
-      <ion-list-header>
-        <ion-label>
+    </div>
+    <div class="aside-right flex-column height-100">
+      <div class="buttons">
+        <button full class="btn-ok" shape="round" >Efectuar dispacho</button>
+        <button class="btn-cancel" shape="round" >Descartar</button>
+        <div class="solid"></div>
+        <button full class="btn-cancel" shape="round" >Solicitar</button>
+        <button class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+        <button full class="btn-cancel" shape="round" >Marcar Reunião</button>
+        <button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <div class="solid"></div>
+        <button class="btn-cancel" shape="round" >Executar</button>
+        <button full class="btn-cancel" shape="round" >Delegar</button>
+        <button class="btn-cancel" shape="round" >Arquivar</button>
+      </div>
+    </div>
+
+    <div *ngIf="!task">
+      <ion-list>
+        <ion-list-header>
+          <ion-label>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </ion-label>
+        </ion-list-header>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-label>
+            <h3>
+              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+            </h3>
+            <p>
+              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+            </p>
+          </ion-label>
+        </ion-item>
+        <ion-button color="medium" shape="round" expand="block">
+          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
           <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-label>
-      </ion-list-header>
-      <ion-item>
-        <ion-thumbnail slot="start">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </h3>
-          <p>
-            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-          </p>
-          <p>
-            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
-          </p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-thumbnail slot="start">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </h3>
-          <p>
-            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-          </p>
-          <p>
-            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
-          </p>
-        </ion-label>
-      </ion-item>
-     
-    </ion-list>
-  </div> -->
-
-  
-</div>
-  <div *ngIf="!task">
-    <ion-list>
-      <ion-list-header>
-        <ion-label>
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-label>
-      </ion-list-header>
-      <ion-item>
-        <ion-label>
-          <h3>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </h3>
-          <p>
-            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-          </p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-label>
-          <h3>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-label>
-          <h3>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </h3>
-          <p>
-            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-          </p>
-        </ion-label>
-      </ion-item>
-      <ion-button color="medium" shape="round" expand="block">
-        <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-        <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-      </ion-button>
-    </ion-list>
+        </ion-button>
+      </ion-list>
+    </div>
   </div>
 </ion-content>
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index b906a9f52..07c05c508 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -1,19 +1,17 @@
 @import '~src/function.scss';
-.header-toolbar{
-    --background:transparent;
-    --opacity: 1;
-
-    .main-header{
-        width: 100%; /* 400px */
-        height: 100%;
-        font-family: Roboto;
-        border-top-left-radius: 25px;
-        border-top-right-radius: 25px;
-        background-color: #fff;
-        overflow:hidden;
-        padding: 30px 20px 0px 20px;
-        color:#000;
-        transform: translate3d(0, 1px, 0);
+.content{
+  padding: 30px 20px 0 20px !important;
+  margin: 0;
+  float: left;
+}
+.main-header{
+  font-family: Roboto;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  background-color: #fff;
+  overflow:auto;
+  color:#000;
+  transform: translate3d(0, 1px, 0);
         
         .header-top{
           width: 360px;
@@ -67,6 +65,7 @@
           font-size: 25px;
           overflow: auto;
           float: left;
+          padding-left: 5px;
         }
         .div-icon{
           width: 40px;
@@ -75,8 +74,7 @@
           overflow: auto;
           padding: 1px;
         }
-    }
- }
+}
 ion-item-group{
     margin: 15px;
 }
@@ -85,141 +83,121 @@ ion-button{
     width: 80%;
     margin: 20px auto;
 }
-.h3-event-title{
-    padding: 15px 0 0px 25px;
-    font-weight: bold;
+
+
+.upper-content{
+  margin-left: 41px;
+  overflow: auto;
+  font-size: 18px;
+
+  .label{
+      border-radius: 20px;
+      background: #fec077;
+      float: right;
+      padding: 5px 13.5px 5px 13.5px;
+      color: #fff;
+  }
+
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .content-details{
+    font-size: 17px;
+    font-weight: 600;
+    .date{
+      color: #797979;
+    }
+    .color-red{
+      color:#d30a0a;
+    }
+
+  } 
+}
+.middle-conten{
+  .middle-content h3, .middle-content p{
+    font-size: 16px;
+  }
+}
+.bottom-content{
+  //width: 360px;
+  margin: 0 auto;
+  
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: #0d89d1;
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    width: 100%;
+    font-size: 15px;
+    color:#0d89d1;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+.aside-right{
+  padding: 30px 20px 0 20px !important;
+
+  .arrow-right{
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+   
+    .arrow-right-icon{
+        width: 37px;
+        float: right;
+        font-size: 35px;
+        overflow: hidden;
+    }
+  }
+  .buttons{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .btn-ok, .btn-cancel, .btn-delete{
+      font-size: 16px !important;
+      font-weight: 600 !important;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+      padding: 15px !important;
+    }
+  }
+  .solid {
+    display: block;
+    width: 90%;
+    border-top: 1px solid #bbb;
+    margin: 0 auto !important;
+    margin-bottom: 10px !important;
+  }
 }
 
-//DIV
-.div-item-Oficial{
-    width: 100%;
-    overflow: auto;
-    border-bottom: 1px solid #ccc;
-    margin: 10px 0 5px 0;
-    /* background: #cab0dc; */
-    /* border-radius: 20px; */
-    /* padding: 10px; */
-    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+@media only screen and (min-width: 1024px) {
+  .content{
+    width: 70%;
+    border-right: 1px solid #d8d8d8;
   }
-  .div-item-Pessoal{
-    width: 100%;
-    overflow: auto;
-    border-bottom: 1px solid #ccc;
-    margin: 10px 0 5px 0;
-    /* background: #cbeecb; */
-    /* border-radius: 20px; */
-    /* padding: 10px; */
-    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+
+  .aside-right{
+    width: 30%;
   }
-  .div-up{
-    width: 100%;
-    overflow: auto;
-  }
-  .div-up h3{
-    margin: 0;
-    padding: 0;
-    font-size: 17px;
-    width: 100%;
-  }
-  .div-icon{
-    width: 10%;
-    font-size: 22px;
-    float: left;
-    color: #808080;
-  }
-  .div-icon ion-icon{
-    display: block;
-    margin: 0 auto;
-  
-  }
-  .div-content-Oficial{
-    width: 85%;
-    float: left;
-    border-left: 4px solid #cab0dc;
-    padding: 0 0 0 12px;
-  }
-  .div-content-Pessoal{
-    width: 85%;
-    float: left;
-    border-left: 4px solid #cbeecb;
-    padding: 0 0 0 12px;
-  }
-  .div-content-Oficial h3, .div-content-Pessoal h3{
-    font-size: 14pt;
-    /* border: 1px solid red; */
-  }
-  .div-content-Oficial p, .div-content-Pessoal p{
-    font-size: 12pt;
-    color: rgb(94, 92, 92);
-    padding: 0 !important;
-    margin: 0 !important;
-  }
-  .div-botton{
-    width: 100%;
-    overflow: auto;
-    margin: 10px 0 5px 0;
-  }
-  .div-botton-left{
-    width: 10%;
-    float: left;
-  }
-  .ion-icon-location{
-    text-align: center;
-    display: block;
-    color: #000;
-    font-size: 16px;
-    margin: 0 auto;
-  }
-  .div-botton-middle{
-    width: 75%;
-    float: left;
-    margin-top: 0.5px;
-  }
-  .div-botton-middle p{
-    padding: 0;
-    margin: 0;
-  }
-  .div-botton-right{
-    width: 10%;
-    float: left;
-    margin: 0;
-    padding: 0;
-  }
-  .ion-icon-attach{
-    color: #666666;
-    font-size: 20px;
-  }
-/* TOGGLE BUTTON */
-  .switch {
-    position: relative;
-    display: inline-block;
-    width: 90px;
-    height: 34px;
-    float: right;
-    margin:20px 20px 0 0;
-  }
-  .div-top-header{
-    width: 400px;
-    margin: 6px auto;
-    background-color: #0782c9;
-    overflow: auto;
-  }
-  .div-search{
-    font-size: 45px;
-    float: left;
-    margin: 0 0 0 10px
-  }
-  .div-logo{
-    background: transparent;
-    width: 150px;
-    margin: 2.5px 0 2.5px 71px;
-    float: left;
-  }
-  .div-logo img{
-    width: 100%;
-  }
-  .div-profile{
-    font-size: 45px;
-    float: right;
-    margin-right: 10px;
-  }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 34b2fd05b..447317a76 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -67,7 +67,6 @@ export class ExpedientePage implements OnInit {
   async viewExpedientDetail(serialNumber:any) {
     console.log(this.profile);
 
-
     let classs;
     if( window.innerWidth <= 1024){
       classs = 'modal modal-desktop'
@@ -75,7 +74,6 @@ export class ExpedientePage implements OnInit {
       classs = 'gabinete-digital-mobile-modal-to-Desktop'
     }
 
-    
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
       componentProps:{
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 3f3d8b37b..211d1c35f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -28,7 +28,7 @@
             <p class="text-center exp-card-title ">Correspondencia</p>
             <p class="text-center exp-card-content">{{count_exp_dailywork}} <span class="title1">Documentos</span></p>
           </div>
-          <div class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div class="exp-card d-flex flex-column justify-center" (click)="viewEventDetail('1')">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-pendente.svg"></ion-icon>
             </div>
@@ -71,7 +71,8 @@
       <div class="aside-content d-none flex-column height-100">
         <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
         <app-events-to-approve [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
-        <app-expedients [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
+        <app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
+        <app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 259bd8ab1..e195887c3 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -32,10 +32,13 @@ export class GabineteDigitalPage implements OnInit {
     showExpediente : false
   }
   showEventsToApprove = false;
-  showEmptyContainer = false;
-  showExpedients = true;
+  showEmptyContainer = true;
+  showExpedients = false;
+  showExpedientDetail = false;
   emptyTextDescription = 'Sem opção selecionada';
 
+  serialNumber:string;
+
   constructor(
     private processesbackend:ProcessesService,
     private modalController: ModalController,
@@ -99,6 +102,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
     this.showEventsToApprove = false;
     this.showExpedients = false;
     this.showExpedients = false;
+    this.showExpedientDetail = false;
   }
 
   LoadCounts() {
@@ -181,6 +185,18 @@ this.processesbackend.GetActionsList().subscribe(res=>{
       this.showExpedients = true;
     }
   }
+  openExpedientPage(data){
+    console.log(data);
+    
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      //this.openExpedientList();
+    }
+    else{
+      this.serialNumber = data;
+      this.showExpedientDetail = true;
+    }
+  }
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
index de66908ef..54f2c4c90 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
@@ -57,14 +57,14 @@
     letter-spacing: normal;
     color: var(--Antartic-grey);
     margin: 0;
-    padding: 0;
+    padding-bottom: 10px;
   }
   .approve-event-detail{
     float: left;
     margin-left: 10px;
   }
   .approve-event-detail p{
-    width: 250px;
+    //width: 250px;
     font-family: Roboto;
     font-size: 13px;
     font-weight: normal;
@@ -74,7 +74,7 @@
     letter-spacing: normal;
     color: var(--black);
     margin: 0;
-    padding: 0;
+    padding-bottom: 10px;
   }
   .approve-event-detail h3{
     width: 250px;
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.html b/src/app/shared/gabinete-digital/expediente/expediente.page.html
index 92952c2d0..4ecda8927 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.html
@@ -2,110 +2,237 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
-        <app-btn-modal-dismiss></app-btn-modal-dismiss>
+        <app-btn-modal-dismiss (click)="openExpedientListPage()"></app-btn-modal-dismiss>
         <div class="middle">
-          <ion-label class="title">11Gabinete Digital</ion-label>
+          <ion-label class="title">Detalhes do Expediente</ion-label>
+        </div>
+        <div class="div-icon">
+            <ion-menu-button autoHide="false">
+              <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+            </ion-menu-button>
         </div>
       </div>
     </div>
   </ion-toolbar>
-  <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
-      <ion-segment-button value="expediente">
-        Expediente
-      </ion-segment-button>
-      <ion-segment-button value="pendentes">
-        Pendentes
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
 </ion-header>
+<!-- <ion-header>
+  <ion-toolbar class="bg-blue">
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="/expediente"></ion-back-button>
+    </ion-buttons>
+    <ion-title>Expediente</ion-title>
+    <ion-buttons slot="end">
+      <ion-menu-button autoHide="false">
+        <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+      </ion-menu-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header> -->
 
-<ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
-  
-  <div [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expediente'">
-      <ion-item-group>
+<ion-menu autoHide="false" side="end" content-id="main-content">
+  <ion-header>
+    <ion-toolbar translucent>
+      <ion-title>Menu</ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <ion-content>
+    <ion-list>
+      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
+        <ion-icon name="documents" slot="start"></ion-icon>
+        <ion-label>Efectuar Despacho</ion-label>
+      </ion-item>
+      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
+        <ion-icon name="arrow-undo" slot="start"></ion-icon>
+        <ion-label>Pedido de Parecer</ion-label>
+      </ion-item>
+      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
+        <ion-icon name="arrow-redo" slot="start"></ion-icon>
+        <ion-label>Pedido de Deferimento</ion-label>
+      </ion-item>
+      <ion-item (click)="openBookMeetingModal(task)">
+        <ion-icon name="calendar" slot="start"></ion-icon>
+        <ion-label>Marcar reunião</ion-label>
+      </ion-item>
+      <ion-item (click)="discartExpedient()">
+        <ion-icon name="trash" slot="start"></ion-icon>
+        <ion-label>Descartar</ion-label>
+      </ion-item>
+      <ion-item disabled>
+        <ion-icon name="paper-plane" slot="start"></ion-icon>
+        <ion-label>Enviar para pendentes</ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</ion-menu>
+<div class="ion-page" id="main-content">
+  <ion-menu-button></ion-menu-button>
+</div>
+
+<ion-content  padding>
+  <div *ngIf="task">
+  <h3 class="h3-event-title">Detalhes do Expediente</h3>
+  <ion-item-group>
+    <ion-item>
+      <ion-label position="stacked">Assunto</ion-label>
+      <ion-input disabled="true">{{ task.Folio }}</ion-input>
+    </ion-item>
+    <ion-item>
+      <ion-label position="stacked">Remetentes</ion-label>
+      <ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
+    </ion-item>
+    <ion-item>
+      <ion-label position="stacked">Data</ion-label>
+      <ion-input disabled="true" value=''>{{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}}</ion-input>
+    </ion-item>
+    <ion-button (click)="viewDocument()" class="btn-ok-no-width" fill="clear" color="#fff" shape="round" expand="block">
+      <ion-icon name="attach" slot="start"></ion-icon>
+      Ver documento
+    </ion-button>
+  </ion-item-group>
+    <div *ngIf="eventsList">
+      <h3 class="h3-event-title">Eventos Associados</h3>
+    <!-- <ion-list>
         <ion-item-sliding>
-          <!-- <ion-item lines="none" *ngFor = "let task of taskslist" >
-            <div class="div-content-expediente">
-              <ion-item lines="none"  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
-                <ion-icon slot="end" name="calendar"></ion-icon>
-                 <h3>{{ task.Folio }}</h3>
-              </ion-item>
-              <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
-              <p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
-            </div>
-          </ion-item> -->
-
-          <ion-item 
-          class="expediente" 
-          lines="none"  
-          *ngFor = "let task of taskslist"
-          (click)="viewExpedientDetail(task.SerialNumber)"
-          >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-            <div class="Rectangle">
-              <div class="exp-top-detail">
-                <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+          <ion-item lines="none" 
+          *ngFor="let event of eventsList"
+          [routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
+            <div class="div-item-{{event.CalendarName}}">
+              <div class="div-up">
+                <div class="div-icon">
+                  <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
-                <div class="exp-remetente">
-                  <ion-label>{{task.Remetente}}</ion-label>
-                </div>
-                <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <label></label>
+                <div class="div-content-{{event.CalendarName}}">
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
+                  <p>{{event.StartDate | date: 'dd-MM-yy | hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
                 </div>
               </div>
-              <div class="exp-bottom-detail">
-                <ion-label>{{ task.Folio }}</ion-label>
+              <div class="div-botton">
+                <div class="div-botton-left">
+                  <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
+                </div>
+                <div class="div-botton-middle">
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
+                </div>
+                <div *ngIf="event.HasAttachments" class="div-botton-right">
+                  <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
+                </div>
               </div>
             </div>
           </ion-item>
-
-
         </ion-item-sliding>
-      </ion-item-group>
-    </ion-list>
-    <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item-group>
-        <ion-item-sliding>
-        </ion-item-sliding>
-      </ion-item-group>
-    </ion-list>
-  </div>
-  <div *ngIf="!taskslist">
-  
+    </ion-list> -->
+
     <ion-list>
+      <div *ngIf="eventsList">
+        <ion-item-sliding>
+          <ion-item 
+            class="Rectangle" lines="none" 
+            *ngFor="let event of eventsList"
+            (click)="viewEventDetail(event.EventId)"
+          >
+              <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
+              <div class="content-{{profile}}-{{event.CalendarName}}">
+                <div class="approve-event-time">
+                  <p>{{event.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
+                  <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
+                  <h3>{{event.Subject}}</h3>
+                </div>
+              </div>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
+    </ion-list>
+
+
+  </div>
+  <!-- <div *ngIf="!eventsList"> 
+    <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
       <ion-item>
-        <ion-thumbnail slot="end">
+        <ion-thumbnail slot="start">
           <ion-skeleton-text animated></ion-skeleton-text>
         </ion-thumbnail>
         <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
         </ion-label>
       </ion-item>
       <ion-item>
-        <ion-thumbnail slot="end">
+        <ion-thumbnail slot="start">
           <ion-skeleton-text animated></ion-skeleton-text>
         </ion-thumbnail>
         <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
         </ion-label>
       </ion-item>
+     
+    </ion-list>
+  </div> -->
+
+  
+</div>
+  <div *ngIf="!task">
+    <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
+      <ion-item>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-button color="medium" shape="round" expand="block">
+        <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
+        <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+      </ion-button>
     </ion-list>
   </div>
 </ion-content>
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.scss b/src/app/shared/gabinete-digital/expediente/expediente.page.scss
index 275e95e28..b906a9f52 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.scss
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.scss
@@ -77,48 +77,53 @@
         }
     }
  }
-/* CONTENT */
-.item-list-small{
-    font-size: 11px;
+ion-item-group{
+    margin: 15px;
+}
+ion-button{
+    display: block;
+    width: 80%;
+    margin: 20px auto;
+}
+.h3-event-title{
+    padding: 15px 0 0px 25px;
+    font-weight: bold;
+}
+
+//DIV
+.div-item-Oficial{
+    width: 100%;
+    overflow: auto;
+    border-bottom: 1px solid #ccc;
+    margin: 10px 0 5px 0;
+    /* background: #cab0dc; */
+    /* border-radius: 20px; */
+    /* padding: 10px; */
+    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  }
+  .div-item-Pessoal{
+    width: 100%;
+    overflow: auto;
+    border-bottom: 1px solid #ccc;
+    margin: 10px 0 5px 0;
+    /* background: #cbeecb; */
+    /* border-radius: 20px; */
+    /* padding: 10px; */
+    /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  }
+  .div-up{
+    width: 100%;
     overflow: auto;
   }
-  .ion-item-class{
-    padding: 0;
-  
-  }
-  .label-text{
-    width: 100%;
-    padding: 0;
-    margin: 0;
-  }
-//DIV
-ion-item{
-  --background: none;
-}
-.div-content-expediente{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #dae3f3;
-  padding:5px 5px 15px 5px;
-  margin: 10px 0 10px 0;
-  background:  #dae3f3;
-  border-radius: 20px;
-}
-.div-content-pendentes{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #d9d9d9;
-  padding: 5px;
-}
-  .div-content-expediente h3, .div-content-pendentes h3{
+  .div-up h3{
     margin: 0;
     padding: 0;
-    font-size: 14pt;
+    font-size: 17px;
     width: 100%;
   }
   .div-icon{
     width: 10%;
-    font-size: 20px;
+    font-size: 22px;
     float: left;
     color: #808080;
   }
@@ -127,101 +132,94 @@ ion-item{
     margin: 0 auto;
   
   }
-  .div-content-expediente p, .div-content-pendentes p{
+  .div-content-Oficial{
+    width: 85%;
+    float: left;
+    border-left: 4px solid #cab0dc;
+    padding: 0 0 0 12px;
+  }
+  .div-content-Pessoal{
+    width: 85%;
+    float: left;
+    border-left: 4px solid #cbeecb;
+    padding: 0 0 0 12px;
+  }
+  .div-content-Oficial h3, .div-content-Pessoal h3{
     font-size: 14pt;
+    /* border: 1px solid red; */
+  }
+  .div-content-Oficial p, .div-content-Pessoal p{
+    font-size: 12pt;
     color: rgb(94, 92, 92);
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+  .div-botton{
+    width: 100%;
+    overflow: auto;
+    margin: 10px 0 5px 0;
+  }
+  .div-botton-left{
+    width: 10%;
+    float: left;
+  }
+  .ion-icon-location{
+    text-align: center;
+    display: block;
+    color: #000;
+    font-size: 16px;
+    margin: 0 auto;
+  }
+  .div-botton-middle{
+    width: 75%;
+    float: left;
+    margin-top: 0.5px;
+  }
+  .div-botton-middle p{
     padding: 0;
     margin: 0;
   }
-  .span-left{
-      /* border: 1px solid red; */
-      float: left;
-      font-size: 12px;
-      padding-left: 18px;
+  .div-botton-right{
+    width: 10%;
+    float: left;
+    margin: 0;
+    padding: 0;
   }
-  .span-right{
-    /* border: 1px solid blue; */
-    text-align: right;
+  .ion-icon-attach{
+    color: #666666;
+    font-size: 20px;
+  }
+/* TOGGLE BUTTON */
+  .switch {
+    position: relative;
+    display: inline-block;
+    width: 90px;
+    height: 34px;
     float: right;
-    font-size: 12px;
-    padding-right: 18px;
-}
-
-/* New CSS */
-.expediente{
-  padding-top: 10px;
-}
-.exp-list-item{
-  width: 368px;
-  overflow: auto;
-  /* border-bottom: 1px solid gray; */
-  margin: 10px auto;
-}
-.exp-top-detail{
-  width: 100%;
-  overflow: auto;
-}
-.exp-date{
-  width: auto;
-  font-family: Roboto;
-  font-size: 13px;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: normal;
-  letter-spacing: normal;
-  color: #797979;
-  float: left;
-}
-.exp-remetente{
-  width: 200px;
-  font-family: Roboto;
-  font-size: 13px;
-  font-weight: normal;
-  color: #000000;
-  float: left;
-  margin-left: 16px;
-
-}
-.exp-icon{
-  width: 45px;
-  float: right;
-  font-size: 13px;
-}
-.exp-icon ion-icon{
-  font-size: 25px;
-  color: #42b9fe;
-}
-.exp-bottom-detail{
-  width: 100px;
-  float: left;
-  font-family: Roboto;
-  font-size: 16px;
-  font-weight: 700;
-  color: #0d89d1;
-}
-.div-top-header{
-  width: 400px;
-  margin: 6px auto;
-  background-color: #0782c9;
-  overflow: auto;
-}
-.div-search{
-  font-size: 45px;
-  float: left;
-  margin: 0 0 0 10px
-}
-.div-logo{
-  background: transparent;
-  width: 150px;
-  margin: 2.5px 0 2.5px 71px;
-  float: left;
-}
-.div-logo img{
-  width: 100%;
-}
-.div-profile{
-  font-size: 45px;
-  float: right;
-  margin-right: 10px;
-}
\ No newline at end of file
+    margin:20px 20px 0 0;
+  }
+  .div-top-header{
+    width: 400px;
+    margin: 6px auto;
+    background-color: #0782c9;
+    overflow: auto;
+  }
+  .div-search{
+    font-size: 45px;
+    float: left;
+    margin: 0 0 0 10px
+  }
+  .div-logo{
+    background: transparent;
+    width: 150px;
+    margin: 2.5px 0 2.5px 71px;
+    float: left;
+  }
+  .div-logo img{
+    width: 100%;
+  }
+  .div-profile{
+    font-size: 45px;
+    float: right;
+    margin-right: 10px;
+  }
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.ts b/src/app/shared/gabinete-digital/expediente/expediente.page.ts
index 8de6c53b6..e70a7cd4f 100644
--- a/src/app/shared/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/shared/gabinete-digital/expediente/expediente.page.ts
@@ -1,13 +1,19 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { CalendarComponent } from 'ionic2-calendar';
-
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { EventsService } from 'src/app/services/events.service';
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { DailyWorkTask } from 'src/app/models/dailyworktask.model';
+import { ActivatedRoute, Router } from '@angular/router';
 import { formatDate } from '@angular/common';
-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 { MenuController, ModalController, NavParams } from '@ionic/angular';
+import { AlertService } from 'src/app/services/alert.service';
+import { Event } from 'src/app/models/event.model';
+import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { momentG }  from 'src/plugin/momentG';
+import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 
 @Component({
   selector: 'app-expediente',
@@ -16,80 +22,143 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/
 })
 export class ExpedientePage implements OnInit {
 
-  segment:string;
-  //profile:string;
-
-  @ViewChild(CalendarComponent) myCal: CalendarComponent;
-
-  taskslist:DailyWorkTask[];
-  serialNumber:string;
+  task: any;
+  fulltask: any;
+  eventsList: Event[];
+  //serialnumber: string;
+  //profile: string;
 
   @Input() profile:string;
+  @Input() serialNumber:string;
+  @Output() openExpedientList:EventEmitter<any> = new EventEmitter<any>();
 
-  constructor(
-    private processes:ProcessesService,
+  constructor(private activateRoute: ActivatedRoute,
+    private processes: ProcessesService,
+    private iab: InAppBrowser,
+    private attachments: AttachmentsService,
+    private events: EventsService,
+    private menu: MenuController,
+    private router: Router,
     private modalController: ModalController,
-    ) { 
-      this.profile = 'mdgpr';
+    //private navParams: NavParams,
+    private alertService: AlertService) { 
+      //this.serialnumber = this.navParams.get('serialNumber');
+      //this.profile = this.navParams.get('profile');
     }
 
   ngOnInit() {
-    //Inicializar segment
-    this.segment = "expediente";
-    this.LoadList();
+    this.profile = "mdgpr";
+    console.log(this.serialNumber);
+    
+    this.activateRoute.paramMap.subscribe(paramMap => {
+      if (!paramMap.has('SerialNumber')) {
+        return;
+      }
+      /* this.serialnumber = paramMap.get('SerialNumber'); */
+      this.LoadTaskDetail(this.serialNumber);
+      this.LoadRelatedEvents(this.serialNumber);
+    });
+    this.LoadTaskDetail(this.serialNumber);
+    this.LoadRelatedEvents(this.serialNumber);
+  }
+  openExpedientListPage(){
+    this.openExpedientList.emit();
   }
 
-  LoadList()
-  {
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      this.taskslist = new Array();
-      result.forEach(element => {
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceFolio,
-          "Senders": element.originator.email,
-          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente
-        }
-        this.taskslist.push(task);
-      });
+
+  async LoadTaskDetail(serial: string) {
+    this.processes.GetTask(serial).subscribe(res => {
+      this.task = {
+        "SerialNumber": res.serialNumber,
+        "Folio": res.workflowInstanceFolio,
+        "Senders": res.originator.email,
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
+      }
+      this.fulltask = res;
+      console.log(res);
+
     });
   }
 
-  doRefresh(event) {
-    this.LoadList();
-
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
+  async LoadRelatedEvents(serial: string) {
+    if (this.eventsList == null) {
+      this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
+        console.log(res);
+        res.forEach(att => {
+          if (this.eventsList == null) {
+            this.eventsList = new Array();
+          }
+          this.events.getEvent(att.ParentId).subscribe(event => {
+            this.eventsList.push(event);
+            console.log(this.eventsList);
+          });
+        });
+      });
+    }
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
+  viewDocument(){
+    const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+    const browser = this.iab.create(url,"_parent");
+    browser.show();
+  }
 
-    let classs;
-    if( window.innerWidth <= 1024){
-      classs = 'modal'
-    } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
-    }
+  openMenu() {
+    this.menu.open();
+  }
 
+  async openExpedientActionsModal(taskAction: any, task: any) {
     const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: taskAction,
+        task: task,
       },
-      cssClass: classs,
+      cssClass: 'expedient-task-modal modal-desktop',
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      
-    });
+    modal.onDidDismiss();
   }
 
+  discartExpedient() {
+    let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
+    console.log(body);
+    this.processes.PostTaskAction(body);
+    this.router.navigate(['/home/gabinete-digital/expediente']);
+  }
+
+  async openBookMeetingModal(task: any) {
+    const modal = await this.modalController.create({
+      component: BookMeetingModalPage,
+      componentProps: {
+        task: task,
+      },
+      cssClass: 'book-meeting-modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
+  async viewEventDetail(eventId: any) {
+    console.log(this.profile);
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+        profile: this.profile,
+      },
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      if (res) {
+      }
+    });
+  }
 }
-  
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index ac92756fd..00b6cffe0 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border">
   <div class="title">
-    <ion-label >Correspondencia</ion-label>
+    <ion-label >Correspondência</ion-label>
   </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment">
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
index 6e5e17b43..653bf936c 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
@@ -33,7 +33,7 @@ ion-item{
     //Sborder: solid 1px #e9e9e9;
     background-color: var(--white);
     margin: 0 auto;
-    padding: 10px;
+    //padding: 10px;
     margin-bottom: 10px;
     overflow: auto;
   }
@@ -94,7 +94,7 @@ ion-item{
   padding-top: 10px;
 }
 .exp-list-item{
-  width: 368px;
+  //width: 368px;
   overflow: auto;
   /* border-bottom: 1px solid gray; */
   margin: 10px auto;
@@ -116,7 +116,7 @@ ion-item{
   float: left;
 }
 .exp-remetente{
-  width: 200px;
+  //width: 200px;
   font-family: Roboto;
   font-size: 13px;
   font-weight: normal;
@@ -135,7 +135,6 @@ ion-item{
   color: #42b9fe;
 }
 .exp-bottom-detail{
-  width: 100px;
   float: left;
   font-family: Roboto;
   font-size: 16px;
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 00dd8602a..ef1d2af24 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
@@ -24,6 +24,7 @@ export class ExpedientsPage implements OnInit {
   serialNumber:string;
 
   @Input() profile:string;
+  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private processes:ProcessesService,
@@ -38,6 +39,12 @@ export class ExpedientsPage implements OnInit {
     this.LoadList();
   }
 
+  openExpedientDetailPage(data){
+    console.log(data);
+    
+    this.openExpedientDetail.emit(data);
+  }
+
   LoadList()
   {
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
@@ -81,8 +88,8 @@ export class ExpedientsPage implements OnInit {
         serialNumber: serialNumber,
         profile: this.profile,
       },
-      cssClass: classs,
-      backdropDismiss: false
+      cssClass: 'modal modal-desktop',
+      backdropDismiss: false,
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{

From d9a04c7519e004304129ba059d05b8d2b6bad83b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 24 Mar 2021 15:22:13 +0100
Subject: [PATCH 12/15] Finish style expedient-detail page

---
 .../expediente-detail.page.html               | 20 ++++-----
 .../expediente-detail.page.scss               | 41 +++++++++++++------
 .../expediente-detail.page.ts                 |  3 +-
 .../expedients/expedients.page.ts             |  1 -
 src/global.scss                               |  2 +-
 src/theme/variables.scss                      |  3 +-
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 0a2089f60..fd53dcb96 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -16,7 +16,7 @@
   </ion-toolbar>
 </ion-header>
 
-<!-- <ion-menu autoHide="false" side="end" content-id="main-content">
+<ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
       <ion-title>Menu</ion-title>
@@ -50,10 +50,10 @@
       </ion-item>
     </ion-list>
   </ion-content>
-</ion-menu> -->
-<!-- <div class="ion-page" id="main-content">
+</ion-menu>
+<div class="ion-page" id="main-content">
   <ion-menu-button></ion-menu-button>
-</div> -->
+</div>
 
 <ion-content class="height-100">
   <div class="main-content d-flex height-100">
@@ -81,29 +81,29 @@
         </div>
       </div>
       <div class="middle-content">
+        <h5>Intervenientes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
           <ion-label>
-            <h3>Intervenientes</h3>
             <div>
               <p>Tiago Kayaya</p>
               <p>Tiago Kayaya</p>
             </div>
           </ion-label>
         </ion-item>
+        <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
           <ion-label>
-            <h3>Detalhes</h3>
-            <p>MINEC, MINFIN</p>
+            <p [innerHTML]="task.Note"></p>
           </ion-label>
         </ion-item>
       </div>
       <div class="bottom-content width-100">
         <ion-list>
-          <h3>Documentos Anexados</h3>
+          <h5>Documentos Anexados</h5>
           <ion-item class="ion-no-margin ion-no-padding">
           <ion-label
           (click)="viewDocument()">
-            <p class="attach-title-item">{{ task.Folio }}</p>
+            <p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon name="close"></ion-icon></span></p>
             <p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd/MM/yy' }}</span></p>
           </ion-label>
         </ion-item>
@@ -151,7 +151,7 @@
         <div class="solid"></div>
         <button class="btn-cancel" shape="round" >Executar</button>
         <button full class="btn-cancel" shape="round" >Delegar</button>
-        <button class="btn-cancel" shape="round" >Arquivar</button>
+        <button class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
     </div>
 
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index 07c05c508..d00c46ad4 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -4,6 +4,13 @@
   margin: 0;
   float: left;
 }
+.color-red{
+  font-weight: 500;
+  color:#d30a0a !important;
+}
+.btn-size{
+  font-size: 18px !important;
+}
 .main-header{
   font-family: Roboto;
   border-top-left-radius: 25px;
@@ -65,6 +72,7 @@
           font-size: 25px;
           overflow: auto;
           float: left;
+          padding-top: 4px;
           padding-left: 5px;
         }
         .div-icon{
@@ -86,6 +94,7 @@ ion-button{
 
 
 .upper-content{
+  font-family: Roboto;
   margin-left: 41px;
   overflow: auto;
   font-size: 18px;
@@ -103,18 +112,13 @@ ion-button{
   }
   .content-details{
     font-size: 17px;
-    font-weight: 600;
     .date{
       color: #797979;
     }
-    .color-red{
-      color:#d30a0a;
-    }
-
-  } 
+  }
 }
 .middle-conten{
-  .middle-content h3, .middle-content p{
+ .middle-content p{
     font-size: 16px;
   }
 }
@@ -139,9 +143,10 @@ ion-button{
     float: left;
   }
   .attach-title-item{
+    font-size: 18px;
     width: 100%;
-    font-size: 15px;
     color:#0d89d1;
+    padding-bottom: 5px;
   }
   /* SPAN */
   .span-left{
@@ -175,6 +180,7 @@ ion-button{
     justify-content: space-between;
 
     .btn-ok, .btn-cancel, .btn-delete{
+      height: auto !important;
       font-size: 16px !important;
       font-weight: 600 !important;
       width: 100% !important;
@@ -185,19 +191,30 @@ ion-button{
   .solid {
     display: block;
     width: 90%;
-    border-top: 1px solid #bbb;
+    border-top: 1px solid #ebebeb;
     margin: 0 auto !important;
     margin-bottom: 10px !important;
   }
 }
 
-@media only screen and (min-width: 1024px) {
+@media only screen and (max-width: 1023px) {
   .content{
-    width: 70%;
+    width: 100%;
+  }
+  .aside-right{
+    display: none;
+  }
+}
+@media only screen and (min-width: 1024px) {
+  .div-icon{
+    display: none;
+  }
+  .content{
+    width: 75%;
     border-right: 1px solid #d8d8d8;
   }
 
   .aside-right{
-    width: 30%;
+    width: 25%;
   }
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 03ada44f6..020d33fa3 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -62,11 +62,12 @@ export class ExpedienteDetailPage implements OnInit {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
         "SerialNumber": res.serialNumber,
-        "Folio": res.workflowInstanceFolio,
+        "Folio": res.workflowInstanceDataFields.Subject,
         "Senders": res.originator.email,
         "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
         "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
         "Remetente": res.workflowInstanceDataFields.Sender,
+        "Note": res.workflowInstanceDataFields.Note,
       }
       this.fulltask = res;
       console.log(res);
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index ef1d2af24..f45ad317f 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -89,7 +89,6 @@ export class ExpedientsPage implements OnInit {
         profile: this.profile,
       },
       cssClass: 'modal modal-desktop',
-      backdropDismiss: false,
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{
diff --git a/src/global.scss b/src/global.scss
index 625e68241..c61b9ad05 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -352,7 +352,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
 
 @media only screen and (min-width: 1024px) {
   .gabinete-digital-mobile-modal-to-Desktop{
-    top: 75px;
+    //top: 75px;
     left: 40%;
 
     .modal-wrapper{
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 950cf7c8d..40a49b1da 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -44,6 +44,7 @@
   --ion-color-warning-tint: #ffca22;
 
   /** danger **/
+  --ion-color-red:#d30a0a;
   --ion-color-danger: #eb445a;
   --ion-color-danger-rgb: 235, 68, 90;
   --ion-color-danger-contrast: #ffffff;
@@ -264,7 +265,7 @@
   background: rgba(51, 51, 51, 0.3); 
 }
 .modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{
-  padding-top: 93px;
+  padding-top: 75px;
   --border-radius: 25px 25px 0 0;
   --border-width:0px;
 }

From dbaa967482c9eefe21753a3db63099c4e6e5b15a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 24 Mar 2021 17:43:55 +0100
Subject: [PATCH 13/15] save

---
 .../expediente-detail.page.html                 | 13 ++++++++++---
 .../expediente-detail/expediente-detail.page.ts | 13 +++++++++++++
 src/app/services/processes.service.ts           | 17 +++++++++++++++--
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index fd53dcb96..a83ffa94b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -84,9 +84,16 @@
         <h5>Intervenientes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
           <ion-label>
-            <div>
-              <p>Tiago Kayaya</p>
-              <p>Tiago Kayaya</p>
+            <div *ngFor="let interveniente of intervenientes">
+              <p>{{interveniente.Name}}</p>
+            </div>
+          </ion-label>
+        </ion-item>
+        <h5>Com conhecimento</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <div *ngFor="let c of cc">
+              <p>{{c.Name}}</p>
             </div>
           </ion-label>
         </ion-item>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 020d33fa3..63156b633 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -26,6 +26,8 @@ export class ExpedienteDetailPage implements OnInit {
   eventsList: Event[];
   serialnumber: string;
   profile: string;
+  intervenientes: any;
+  cc: any;
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
@@ -68,9 +70,20 @@ export class ExpedienteDetailPage implements OnInit {
         "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
         "Remetente": res.workflowInstanceDataFields.Sender,
         "Note": res.workflowInstanceDataFields.Note,
+        "FolderId": res.workflowInstanceDataFields.FolderID
       }
       this.fulltask = res;
       console.log(res);
+      this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
+        this.intervenientes = users.filter(user=>{
+          return user.Type == 'I';
+        });
+        this.cc = users.filter(user=>{
+          return user.Type == 'CC';
+        });
+        console.log(users);
+        
+      })
 
     });
   }
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index dbc919389..186a5801b 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -37,8 +37,7 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
-  GetTask(serialnumber:string): Observable<any>
-  {
+  GetTask(serialnumber:string): Observable<any>{
     const geturl = environment.apiURL + 'Tasks/FindTask';
     let params = new HttpParams();
 
@@ -50,6 +49,20 @@ export class ProcessesService {
     };
     return this.http.get<any>(`${geturl}`, options);
   }
+
+  GetTaskParticipants(folderId:string): Observable<any>{
+    const geturl = environment.apiURL + 'Processes/GetUsersInDispash';
+    let params = new HttpParams();
+
+    params = params.set("folderId", folderId);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
   FindTaskDocId(serialnumber:string): Observable<any>
   {
     const geturl = environment.apiURL + 'Tasks/FindExpedienteDocId';

From a34d2b341e37fa788bbd9a4c374211beb5675108 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 25 Mar 2021 10:05:50 +0100
Subject: [PATCH 14/15] save

---
 .../approve-event-modal/approve-event-modal.page.html |  2 +-
 .../gabinete-digital/event-list/event-list.page.ts    |  8 +++++---
 .../events-to-approve/events-to-approve.page.ts       | 11 +++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 47245336b..16c3a8307 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -48,7 +48,7 @@
     <div class="content-details">
       <ion-label>
         <p>{{customDate}}</p>
-        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate}} às {{loadedEvent.workflowInstanceDataFields.EndDate}}</p>
         <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
         <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
       </ion-label>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 666145b04..9f683ff49 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -34,6 +34,7 @@ S
     this.segment = this.navParams.get('segment');
     /* console.log(this.navParams.get('md')); */
     console.log(this.segment);
+    
     this.LoadToApproveEvents();
     
 
@@ -64,9 +65,9 @@ S
       this.eventsMDGPRList = res;
     });
   }
+
+
   async openApproveModal(eventSerialNumber){
-
-
     let classs;
     if( window.innerWidth <= 1024){
       classs = 'cal-modal  modal modal-desktop'
@@ -79,7 +80,7 @@ S
       componentProps:{
         serialNumber: eventSerialNumber,
       },
-      cssClass: classs,
+      cssClass: 'event-list',
       backdropDismiss: false
     });
 
@@ -87,6 +88,7 @@ S
 
     modal.onDidDismiss();
   }
+
   doRefresh(event) {
     this.LoadToApproveEvents();
     console.log('refresh');
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 93fef7c8f..28b062b11 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -67,28 +67,23 @@ S
     });
   }
   async openApproveModal(eventSerialNumber){
-
-
     let classs;
     if( window.innerWidth <= 1024){
-      classs = 'cal-modal  modal modal-desktop'
+      classs = 'modal modal-desktop'
     } else  {
-      classs = 'gabinete-digital-mobile-modal-to-Desktop'
+      classs = 'modal modal-desktop'
     }
-
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,
       componentProps:{
         serialNumber: eventSerialNumber,
       },
       cssClass: classs,
-      backdropDismiss: false
     });
-
     await modal.present();
-
     modal.onDidDismiss();
   }
+
   doRefresh(event) {
     this.LoadToApproveEvents();
     console.log('refresh');

From a29a25d7cc8362ce78419afcbfdf74c8117f74fe Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 25 Mar 2021 15:46:43 +0100
Subject: [PATCH 15/15] style events to approve details view

---
 .../expediente-detail.page.html               |   4 +-
 .../expediente-detail.page.scss               |   2 +-
 .../approve-event.component.html              | 132 +++++-----
 .../approve-event.component.scss              | 247 ++++++++++++------
 .../approve-event/approve-event.component.ts  |   6 +-
 .../events-to-approve.page.html               |   2 +-
 .../events-to-approve.page.ts                 |   7 +-
 src/global.scss                               |  37 +++
 8 files changed, 281 insertions(+), 156 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index a83ffa94b..3ccb997eb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -1,4 +1,4 @@
-<ion-header hidden  class="ion-no-border">
+<!-- <ion-header hidden  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
@@ -14,7 +14,7 @@
       </div>
     </div>
   </ion-toolbar>
-</ion-header>
+</ion-header> -->
 
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index d00c46ad4..ac378214b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -101,7 +101,7 @@ ion-button{
 
   .label{
       border-radius: 20px;
-      background: #fec077;
+      background: #ffb703;
       float: right;
       padding: 5px 13.5px 5px 13.5px;
       color: #fff;
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index 7223e8b49..9fe12aa8e 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border px-20">
+<ion-header hidden class="ion-no-border px-20">
   <div class="header-content d-flex justify-space-between">
     <div class="header-icon-left">
       <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
@@ -6,7 +6,7 @@
     <div class="header-title flex-grow-1">
       <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
     </div>
-    <div class="header-icon-right">
+    <div class="header-icon-right display-none-{{showAside}}">
       <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
     </div>
   </div>
@@ -36,72 +36,80 @@
 </ion-menu>
 
 <ion-content id="main-content">
-  <div class="upper-content">
-    <div class="content-location d-flex justify-space-between">
-      <div class="location-detail">
-        <ion-label >{{loadedEvent.workflowInstanceDataFields.Location}}</ion-label>
+  <div class="main-content d-flex height-100">
+    <div class="content">
+      <div class="header-content width-100 d-flex justify-space-between">
+        <div class="header-icon-left">
+          <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
+        </div>
+        <div class="header-title flex-grow-1">
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
+        </div>
+        <div class="header-icon-right display-none-{{showAside}}">
+          <ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
+        </div>
       </div>
-      <div class="button-calendar-type">
-        <ion-button  class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
+      <div class="upper-content d-flex flex-column">
+        <div class="content-location">
+          <p>
+            <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
+          </p>
+        </div>
+        <div class="content-details">
+          <ion-label>
+            <p>{{customDate}}</p>
+            <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
+            <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="middle-content">
+        <h5>Intervenientes</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
+          </ion-label>
+        </ion-item>
+        <h5>Detalhes</h5>
+        <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
+          </ion-label>
+        </ion-item>
       </div>
-    </div>
-    <div class="content-details">
-      <ion-label>
-        <p>{{customDate}}</p>
-        <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
-        <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
-        <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
-      </ion-label>
-    </div>
-  </div>
-  <div class="middle-content">
-    <ion-item>
-      <ion-label>
-        <h3>Intervenientes</h3>
-        <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
-      </ion-label>
-    </ion-item>
-    <ion-item>
-      <ion-label>
-        <h3>Detalhes</h3>
-        <p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
-      </ion-label>
-    </ion-item>
-  </div>
 
-  <div *ngIf="loadedAttachments" class="bottom-content">
-    <ion-list>
-      <h3>Documentos Anexados</h3>
-      <ion-item>
-      <ion-label>
-        <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
-      </ion-label>
-    </ion-item>
-    </ion-list>
+      <div *ngIf="loadedAttachments" class="bottom-content">
+        <ion-list>
+          <h3>Documentos Anexados</h3>
+          <ion-item class="ion-no-margin ion-no-padding">
+          <ion-label>
+            <p class="attach-title-item">Receita por Natureza</p>
+            <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
+          </ion-label>
+        </ion-item>
+        </ion-list>
+      </div>
+    </div>
+    <div *ngIf="showAside" class="aside-right flex-column height-100">
+      <div class="aside-buttons">
+        <button full class="btn-ok" shape="round" >Editar evento</button>
+        <button full class="btn-ok" shape="round" >Aprovar</button>
+        <button class="btn-cancel" shape="round" >Emendar</button>
+        <div class="solid"></div>
+        <button full class="btn-delete" shape="round" >Rejeitar</button>
+      </div>
+    </div>
   </div>
 </ion-content>
-<ion-footer>
-  <ion-toolbar>
+<ion-footer class="display-none-{{showAside}}">
     <div class="buttons">
-    <ion-item lines="none">
-      <p>
-        <ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
-      </p>
-      <p>
-       <ion-menu-button autoHide="false">
+      <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
+      <ion-menu-button autoHide="false">
         <ion-icon  (click)="openMenu()" name="ellipsis-vertical-outline"></ion-icon>
       </ion-menu-button>
-      </p>
-      <p>
-        <ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
-      </p>
-    </ion-item>
-    <ion-item hidden>
-      <p>
-        <ion-button class="button-reject" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</ion-button>
-      </p>
-    </ion-item>
-  </div>
-  </ion-toolbar>
+      <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
+      <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
+    </div>
 </ion-footer>
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.scss b/src/app/shared/agenda/approve-event/approve-event.component.scss
index b33b2cc3d..835223e87 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.scss
+++ b/src/app/shared/agenda/approve-event/approve-event.component.scss
@@ -1,14 +1,12 @@
-ion-content{
-    --padding-top:0px;
-    --padding-start: 20px;
-    --padding-end: 20px;
-    font-size: 18px;
-  }
   ion-menu{
     --height: 225px;
   }
+  .display-none-true{
+    display: none;
+    border: 1px solid red;
+  }
   .header-content{
-    margin: 25px auto;
+    //margin: 25px auto;
   }
   .header-icon-left{
     width: 36px;
@@ -29,95 +27,146 @@ ion-content{
     font-size: 45px;
     float: left;
   }
-  .upper-content{
-    margin-left: 50px;
-    font-size: 18px;
-  
-    .content-location{
-      margin: 0 auto;
-      padding: 0;
-    }
-  
-    .location-detail{
-      width: 210px;
-      font-weight: 700;
+
+  .content{
+    padding: 30px 20px 0 20px !important;
+    overflow: auto;
+    width: 100%;
+
+    .upper-content{
+      margin-left: 40px;
       font-size: 18px;
-      float: left;
-      margin: 5px 5px 5px 0px;
-    }
-    .button-calendar-type{
-        width: 91px;
-        --border-radius: 12.5px;
-        --background: #ffb703;
-        margin-left: 5px;
-        float: left;
-    }
-    .button-calendar-type ion-button{
-      height: 25px;
-    }
-    .button-edit-event {
-        width: 140px;
-        height: 44px;
-        border-radius: 22.5px;
-        --background: #e0e9ee;
-        --color:#061b52;
-    }
-    .content-details p{
-        font-size: 16px;
-    }
-  }
-  .middle-conten{
-    .middle-content h3, .middle-content p{
-      font-size: 16px;
-    }
-  }
-  
-  .bottom-content{
-    width: 360px;
-    margin: 0 auto;
     
-    .bottom-content h3{
-      font-size: 16px;
-      margin: 0 0 0 10px;
+      .content-location{
+        margin-top: 0px !important;
+        width: 100%;
+        padding: 0;
+      }
+
+      .location{
+        float: left;
+      }
+      .event-type-Oficial{
+        font-family: Roboto;
+        border-radius: 20px;
+        background: #fec077;
+        float: right !important;
+        padding: 5px 13.5px 5px 13.5px;
+        color: #fff;
+      }
+      .event-type-Pessoal{
+        font-family: Roboto;
+        border-radius: 20px;
+        background: #f05d5e;
+        float: right !important;
+        padding: 5px 13.5px 5px 13.5px;
+        color: #fff;
+      }
+      .button-edit-event {
+          width: 140px;
+          height: 44px;
+          border-radius: 22.5px;
+          --background: #e0e9ee;
+          --color:#061b52;
+      }
+      .content-details p{
+          font-size: 16px;
+      }
     }
-    .attach-document{
-      font-size: 15px;
-      color: #0d89d1;
-      margin: 5px 5px 5px 10px;
-      padding: 5px;
-      float: left;
+    .middle-conten{
+      .middle-content h3, .middle-content p{
+        font-size: 16px;
+      }
     }
-    .attach-icon{
-      width: 37px;
-      font-size: 35px;
-      float: left;
+    
+    .bottom-content{
+      width: 360px;
+      margin: 0 auto;
+      
+      .bottom-content h3{
+        font-size: 16px;
+        margin: 0 0 0 10px;
+      }
+      .attach-document{
+        font-size: 15px;
+        color: #0d89d1;
+        margin: 5px 5px 5px 10px;
+        padding: 5px;
+        float: left;
+      }
+      .attach-icon{
+        width: 37px;
+        font-size: 35px;
+        float: left;
+      }
+      .attach-title-item{
+        width: 100%;
+        font-size: 15px;
+        color:#0d89d1;
+      }
+      /* SPAN */
+      .span-left{
+        float: left;
+        font-size: 15x;
+      }
+      .span-right{
+      text-align: right;
+      float: right;
+      font-size: 13px;
+      }
     }
-    .attach-title-item{
-      width: 100%;
-      font-size: 15px;
-      color:#0d89d1;
-    }
-    /* SPAN */
-    .span-left{
-      float: left;
-      font-size: 15x;
-    }
-    .span-right{
-    text-align: right;
-    float: right;
-    font-size: 13px;
-    }
-  }
+}
+  .aside-right{
+    overflow: auto;
+    padding: 30px 20px 0 20px !important;
   
-  .buttons{
-    width: 360px;
-    margin: 0 auto;
+    .arrow-right{
+      display: flex;
+      justify-content: flex-end;
+      margin-bottom: 20px;
+     
+      /* .arrow-right-icon{
+          width: 37px;
+          float: right;
+          font-size: 35px;
+          overflow: hidden;
+      } */
+    }
+    .aside-buttons{
+      width: 100% !important;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+  
+      .btn-ok, .btn-cancel, .btn-delete{
+        height: auto !important;
+        font-size: 16px !important;
+        font-weight: 600 !important;
+        width: 100% !important;
+        margin-bottom: 10px !important;
+        padding: 15px !important;
+      }
+    }
+    .solid {
+      display: block;
+      width: 90%;
+      border-top: 1px solid #ebebeb;
+      margin: 0 auto !important;
+      margin-bottom: 10px !important;
+    }
   }
+
+
+  .buttons{
+    display: flex;
+    justify-content: space-between;
+    overflow: auto;
+  
   
   .button-options {
       height: 44px;
-       --color: #42b9fe;
-       /* opacity: 0; */
+      --color: #42b9fe;
+      /* opacity: 0; */
   }
   .button-approve {
     width: 140px;
@@ -132,4 +181,30 @@ ion-content{
     border-radius: 22.5px;
     --background: #ffe0e0;
   }
+}
+
+
+
+
+ /*  @media only screen and (max-width: 1140px) {
+    .content{
+      width: 100%;
+    }
+    .aside-right{
+      display: none;
+    }
+  } */
+  /* @media only screen and (min-width: 1140px) {
+    .div-icon{
+      display: none;
+    }
+    .content{
+      //width: 75%;
+      border-right: 1px solid #d8d8d8;
+    }
+  
+    .aside-right{
+      width: 25%;
+    }
+  } */
   
\ No newline at end of file
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts
index 507fd31c9..d581aead1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.component.ts
@@ -21,11 +21,13 @@ export class ApproveEventComponent implements OnInit {
   loadedAttachments:any;
   customDate:any;
   today:any;
+  show: boolean = false;
   
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
   @Input() serialNumber:string;
+  @Input() showAside:boolean;
 
   @Output() approveEventDismiss = new EventEmitter<any>();
   @Output() closeEventToApprove = new EventEmitter<any>();
@@ -44,6 +46,8 @@ export class ApproveEventComponent implements OnInit {
   ngOnInit() {
     this.getTask();
     this.getAttachments();
+    console.log(this.showAside);
+    
   }
 
   notImplemented(){
@@ -53,6 +57,7 @@ export class ApproveEventComponent implements OnInit {
   close(){
     /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.closeEventToApprove.emit();
+    this.modalController.dismiss();
   }
 
   getTask(){
@@ -119,7 +124,6 @@ export class ApproveEventComponent implements OnInit {
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
       componentProps:{
-        
       },
       cssClass: 'emend-message-modal',
       backdropDismiss: false
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index fc7a502b1..e80912988 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -1,6 +1,6 @@
 <ion-content>
   <div class="title width-100">
-    <label>Eventos para Aprovação</label>
+    <label>Sim Eventos para Aprovação</label>
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment">
         <ion-segment-button value="MDGPR">
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 28b062b11..c07018dd9 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { NavigationEnd, Router } from '@angular/router';
-import { ApproveEventModalPage } from 'src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
+import { ApproveEventComponent } from '../../agenda/approve-event/approve-event.component';
 
 @Component({
   selector: 'app-events-to-approve',
@@ -71,12 +71,13 @@ S
     if( window.innerWidth <= 1024){
       classs = 'modal modal-desktop'
     } else  {
-      classs = 'modal modal-desktop'
+      classs = 'modal modal-desktop showAsideOptions'
     }
     const modal = await this.modalController.create({
-      component: ApproveEventModalPage,
+      component: ApproveEventComponent,
       componentProps:{
         serialNumber: eventSerialNumber,
+        showAside: true,
       },
       cssClass: classs,
     });
diff --git a/src/global.scss b/src/global.scss
index 42ca656e6..a88d8b321 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -290,6 +290,43 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
         height: 100%;
     }
 }
+.hideAsideOptions{
+    @media only screen and (min-width: 1140px) {
+        .div-icon{
+          display: none;
+        }
+        .content{
+          width: 100%;
+          border-right: 1px solid #d8d8d8;
+        }
+      
+        .aside-right{
+          display: none;
+        }
+      }
+    /* .aside-right{
+        display: none;
+        width: 0;
+    }
+    .content{
+        width: 100%;
+    } */
+}
+.showAsideOptions{
+    @media only screen and (min-width: 1140px) {
+        .div-icon{
+          display: none;
+        }
+        .content{
+          width: 75%;
+          border-right: 1px solid #d8d8d8;
+        }
+      
+        .aside-right{
+          width: 25%;
+        }
+      }
+}
 
 .modal-width-100{
     .modal-wrapper{