From eb189b6b2a13a49e5175bc83ec4e87eefee8924e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 14 Apr 2021 13:56:38 +0100
Subject: [PATCH 01/18] save

---
 src/app/app-routing.module.ts                 |   4 +
 src/app/home/home-routing.module.ts           |   2 +-
 src/app/pages/chat/chat.module.ts             |   3 +
 src/app/pages/chat/chat.page.html             |   1 +
 src/app/pages/chat/chat.page.ts               |  27 +++
 .../chat/edit-group/edit-group.page.html      |   4 +-
 .../pages/chat/edit-group/edit-group.page.ts  |  14 +-
 .../group-messages/group-messages.page.html   |   2 +-
 .../edit-group/edit-group-routing.module.ts   |  17 ++
 .../chat/edit-group/edit-group.module.ts      |  22 +++
 .../chat/edit-group/edit-group.page.html      |  40 ++++
 .../chat/edit-group/edit-group.page.scss      | 151 +++++++++++++++
 .../chat/edit-group/edit-group.page.spec.ts   |  24 +++
 .../shared/chat/edit-group/edit-group.page.ts | 176 ++++++++++++++++++
 .../popover/chat-popover/chat-popover.page.ts |   4 +-
 15 files changed, 482 insertions(+), 9 deletions(-)
 create mode 100644 src/app/shared/chat/edit-group/edit-group-routing.module.ts
 create mode 100644 src/app/shared/chat/edit-group/edit-group.module.ts
 create mode 100644 src/app/shared/chat/edit-group/edit-group.page.html
 create mode 100644 src/app/shared/chat/edit-group/edit-group.page.scss
 create mode 100644 src/app/shared/chat/edit-group/edit-group.page.spec.ts
 create mode 100644 src/app/shared/chat/edit-group/edit-group.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index e4573a5ba..bb288f651 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -39,6 +39,10 @@ const routes: Routes = [
     path: 'document-detail',
     loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
   },
+  {
+    path: 'edit-group',
+    loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 2cddad43e..8a8e01dc6 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -229,7 +229,7 @@ const routes: Routes = [
           {
             path:'',
             loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule)
-          }
+          },
         ]
       },
     ]
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index fb3ceaaeb..52cbac45d 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -16,6 +16,7 @@ import { ContactsPage } from 'src/app/shared/chat/messages/contacts/contacts.pag
 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';
 import { PipesModule } from 'src/app/pipes/pipes.module';
+import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
 
 @NgModule({
   imports: [
@@ -33,6 +34,7 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
     ContactsPage,
     GroupMessagesPage,
     NewGroupPage,
+    EditGroupPage,
     GroupContactsPage,
     EmptyChatPage,
   ],
@@ -42,6 +44,7 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
     ContactsPage, 
     GroupMessagesPage,
     NewGroupPage,
+    EditGroupPage,
     GroupContactsPage,
     EmptyChatPage,
   ]
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index a53954fc4..5fbd40203 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -98,6 +98,7 @@
         <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>
+        <app-edit-group [roomId]="roomId" *ngIf="showEditGroup" class="d-flex height-100 flex-column"></app-edit-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>
       </div>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index f93e4b569..7d81992a7 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -20,6 +20,7 @@ import { NewGroupPage } from './new-group/new-group.page';
 import { NewchatPage } from './newchat/newchat.page';
 import { Storage } from '@ionic/storage';
 import { AlertService } from 'src/app/services/alert.service';
+import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
 
 @Component({
   selector: 'app-chat',
@@ -63,6 +64,7 @@ export class ChatPage implements OnInit {
   showMessages=false;
   showContacts=false;
   showNewGroup=false;
+  showEditGroup=false;
   showGroupMessages=false;
   showGroupContacts=false;
   emptyTextDescription = 'Sem conversa selecionada';
@@ -105,6 +107,7 @@ export class ChatPage implements OnInit {
     this.showMessages=false;
     this.showContacts=false;
     this.showNewGroup=false;
+    this.showEditGroup=false;
     this.showGroupMessages=false;
     this.showEmptyComponent=false;
     this.showGroupContacts=false;
@@ -154,6 +157,17 @@ export class ChatPage implements OnInit {
       this.showNewGroup=true;
     }
   }
+
+  openEditGroupPage(rid) {
+    if( window.innerWidth <= 1024){
+      this.editGroup(rid);
+    }
+    else{
+      this.closeAllDesktopComponents();
+      this.showEditGroup=true;
+    }
+  }
+
   openGroupMessagesPage(data) {
     console.log('HERE');
     
@@ -263,6 +277,19 @@ export class ChatPage implements OnInit {
     await modal.present();
     modal.onDidDismiss();
   }
+
+  async editGroup(roomId){
+    const modal = await this.modalController.create({
+      component: EditGroupPage,
+      cssClass: 'edit-group',
+      componentProps: {
+        roomId: roomId,
+      },
+    });
+    await modal.present();
+    modal.onDidDismiss();
+  }
+
   async openMessagesModal(roomId:any){
     this.closeAllDesktopComponents();
 
diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/pages/chat/edit-group/edit-group.page.html
index 70ef13159..ebba2fd89 100644
--- a/src/app/pages/chat/edit-group/edit-group.page.html
+++ b/src/app/pages/chat/edit-group/edit-group.page.html
@@ -3,7 +3,9 @@
     <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>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="middle">
           <ion-label class="title">Alterar assunto</ion-label>
diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/pages/chat/edit-group/edit-group.page.ts
index c267038f5..4a9fd2a85 100644
--- a/src/app/pages/chat/edit-group/edit-group.page.ts
+++ b/src/app/pages/chat/edit-group/edit-group.page.ts
@@ -14,6 +14,7 @@ export class EditGroupPage implements OnInit {
   selectedDuration = ['','',''];
   groupName:string;
   room:any;
+  roomId:string;
 
   constructor(
     private modalController: ModalController,
@@ -21,12 +22,19 @@ export class EditGroupPage implements OnInit {
     private chatService: ChatService,
     private navParams: NavParams,
   ) {
-    this.room = this.navParams.get('room');
-    this.groupName = this.room.name.split('-').join(' ');
+    this.roomId = this.navParams.get('roomId');
    }
 
   ngOnInit() {
-    console.log(this.room);
+    this.getRoomInfo();
+  }
+
+  getRoomInfo(){
+    this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
+      this.room = room['room'];
+      console.log(this.room);
+      this.groupName = this.room.name.split('-').join(' ');
+    });
   }
 
   close(){
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index a42f3ea1f..e9dce4ed3 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -48,7 +48,7 @@
       </div>
     </div>
     <div *ngIf="msg.t == 'r'" class="info-text">
-      <ion-label>Alterou o assunto de para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
+      <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
     </div>
   </div>
 
diff --git a/src/app/shared/chat/edit-group/edit-group-routing.module.ts b/src/app/shared/chat/edit-group/edit-group-routing.module.ts
new file mode 100644
index 000000000..bb3c59158
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EditGroupPage } from './edit-group.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EditGroupPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EditGroupPageRoutingModule {}
diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts
new file mode 100644
index 000000000..debb5f06d
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditGroupPageRoutingModule } from './edit-group-routing.module';
+
+import { EditGroupPage } from './edit-group.page';
+import { SharedModule } from '../../shared.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SharedModule,
+    EditGroupPageRoutingModule
+  ],
+  declarations: [EditGroupPage]
+})
+export class EditGroupPageModule {}
diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/shared/chat/edit-group/edit-group.page.html
new file mode 100644
index 000000000..70ef13159
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group.page.html
@@ -0,0 +1,40 @@
+<ion-header  class="ion-no-border">
+  <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">Alterar assunto</ion-label>
+        </div>
+        <app-btn-seguinte *ngIf="groupName" (click)="changeGroupName()"></app-btn-seguinte>
+      </div>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <div class="main-content">
+    <div class="item-container">
+      <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
+    </div>
+    <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>
+
+    <div *ngIf="showDuration" class="container-div">
+      <div class="ion-item-class-2">
+        <div class="ion-icon-class">
+          <ion-icon slot="start" src="assets/images/icons-duration.svg"></ion-icon>
+        </div>
+        <div class="ion-input-class">
+          <ion-input (click)="showPicker()" [(ngModel)]="displayDuration" placeholder="Duração"></ion-input>
+        </div>
+      </div>
+    </div>
+    
+  </div>    
+</ion-content>
+
diff --git a/src/app/shared/chat/edit-group/edit-group.page.scss b/src/app/shared/chat/edit-group/edit-group.page.scss
new file mode 100644
index 000000000..428f62e08
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group.page.scss
@@ -0,0 +1,151 @@
+ion-content{
+    --background:transparent;
+}
+.header-toolbar{
+   --background:transparent;
+   --opacity: 1;
+}
+.div-top-header{
+    width: 400px;
+    margin: 0 auto;
+    background-color: #0782c9;
+    overflow: auto;
+    padding-top: 15px;
+    border: 0!important;
+
+    .div-search{
+      font-size: 45px;
+      float: left;
+      margin: 0 0 0 10px
+    }
+    .div-logo{
+      background: transparent;
+      width: 140px;
+      margin: 5px 0 0px 71px;
+      float: left;
+    }
+    .div-logo img{
+      width: 100%;
+    }
+    .div-profile{
+      font-size: 45px;
+      float: right;
+      margin-right: 10px;
+    }
+    
+  }
+  .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);
+    
+    .title-content{
+      width: 360px;
+      margin: 0px auto;
+      overflow: auto;
+      padding: 0 !important;
+      background: #fff;
+
+      .left{
+        width: 37px;
+        float: left;
+        font-size: 35px;
+        overflow: auto;
+       }
+       .middle{
+        padding: 0!important;
+        float: left;
+        width: 221px;
+        margin: 2.5px 0 0 5px;
+      }
+      .right{
+        padding: 0!important;
+        float: right;
+        font-size: 15px;
+        color: #0782c9;
+        margin: 8px 0 0 5px;
+      }
+    }
+
+    .title{
+      font-size: 25px;
+    }
+    .div-icon{
+      width: 40px;
+      float: right;
+      font-size: 35px;
+      overflow: auto;
+      padding: 1px;
+    }
+    .div-icon ion-icon{
+      float: right;
+      padding-left: 20px;
+    }
+    
+ 
+  }
+  .main-content{
+    width: 100%; /* 400px */
+    height: 100%;
+    font-family: Roboto;
+    margin: 0 auto;
+    background-color: #fff;
+    overflow:auto;
+    padding: 15px 20px 0 20px;
+
+    .item-container{
+        width: 360px;
+        margin: 15px auto;
+        border: 1px solid #ebebeb;
+        border-radius: 5px;
+        padding-left: 10px;
+      }
+
+      .item-container-no-border{
+        display: flex;
+        width: 360px;
+        margin: 25px auto;
+        border-radius: 5px;
+        align-items: center;
+      }
+
+      .item-container-no-border ion-label{
+          padding-left: 10px;
+          font-size: 12px;
+          color: #000;
+      }
+  }
+
+  .container-div{
+    margin-bottom: 15px;
+    overflow: auto;
+
+    .ion-item-class-2{
+        width: 360px;
+        margin: 0px auto;
+
+        .ion-icon-class{
+            width: 45px;
+            height: 45px;
+            float: left;
+            padding: 10px;
+            font-size: 25px;
+          }
+      }
+      .ion-input-class{
+        width: 315px;
+        height: 45px;
+        border: 1px solid #ebebeb;
+        border-radius: 5px;
+        padding-left: 5px;
+        padding-right: 10px;
+        float: left;
+      }
+  }
diff --git a/src/app/shared/chat/edit-group/edit-group.page.spec.ts b/src/app/shared/chat/edit-group/edit-group.page.spec.ts
new file mode 100644
index 000000000..8a4b49569
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EditGroupPage } from './edit-group.page';
+
+describe('EditGroupPage', () => {
+  let component: EditGroupPage;
+  let fixture: ComponentFixture<EditGroupPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditGroupPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EditGroupPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts
new file mode 100644
index 000000000..328b6df18
--- /dev/null
+++ b/src/app/shared/chat/edit-group/edit-group.page.ts
@@ -0,0 +1,176 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ModalController, NavParams, PickerController } from '@ionic/angular';
+import { ChatService } from 'src/app/services/chat.service';
+
+@Component({
+  selector: 'app-edit-group',
+  templateUrl: './edit-group.page.html',
+  styleUrls: ['./edit-group.page.scss'],
+})
+export class EditGroupPage implements OnInit {
+  showLoader: boolean;
+  displayDuration: any;
+  showDuration: boolean;
+  selectedDuration = ['','',''];
+  groupName:string;
+  room:any;
+  @Input() roomId:string;
+
+  constructor(
+    private modalController: ModalController,
+    private pickerController: PickerController,
+    private chatService: ChatService,
+    private navParams: NavParams,
+  ) {
+   }
+
+  ngOnInit() {
+    this.getRoomInfo();
+  }
+
+  getRoomInfo(){
+    this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
+      this.room = room['room'];
+      console.log(this.room);
+      this.groupName = this.room.name.split('-').join(' ');
+    });
+  }
+
+  close(){
+    this.modalController.dismiss();
+  }
+
+  changeGroupName(){
+    if(this.groupName.trim().length > 1){
+      let name = this.groupName.split(' ').join('-');
+      let body = {
+        "roomId": this.room._id,
+        "name": name,
+      }
+      this.chatService.renameGroup(body).subscribe(res=>{
+        this.modalController.dismiss(res['group']);
+      });
+    }
+    else{
+      console.log("Invalid name!");
+    }  
+  }
+  _ionChange(event){
+    this.showDuration = event.detail.checked;
+  }
+  async showPicker(){
+    const picker = await this.pickerController.create({
+      cssClass: '',
+      buttons: [
+          { 
+            text: 'Cancelar', role: 'cancel', cssClass: 'btn-cancel'
+          },
+          { 
+            text: 'Ok', 
+            cssClass: 'btn-cancel',
+            handler:(value:any)=>{
+              console.log('button done pressed');
+              this.selectedDuration = [
+                value.days.value,
+                value.hours.value,
+                value.minutes.value,
+              ]
+              console.log(this.selectedDuration);
+              if(value.days.value != null && value.hours.value != null && value.minutes.value != null){
+                if(value.days.value > 0){
+                  if(value.days.value == 1){
+                    if(value.hours.value == 1){
+                      this.displayDuration = value.days.value  + " day " +  
+                      value.hours.value + " hora " +
+                      value.minutes.value + " minutos";
+                    }
+                    else{
+                      this.displayDuration = value.days.value  + " days " + 
+                      value.hours.value + " horas " +
+                      value.minutes.value + " minutos";
+                    }
+                  }
+                  else{
+                    if(value.hours.value == 1){
+                      this.displayDuration = value.days.value  + " days " +  
+                      value.hours.value + " hora " +
+                      value.minutes.value + " minutos";
+                    }
+                    else{
+                      this.displayDuration = value.days.value  + " days " + 
+                      value.hours.value + " horas " +
+                      value.minutes.value + " minutos";
+                    }
+                  }
+                }
+                else{
+                  if(value.hours.value == 1){
+                    this.displayDuration = value.hours.value + " hora " +
+                    value.minutes.value + " minutos";
+                  }
+                  else{
+                    this.displayDuration = value.hours.value + " horas " +
+                    value.minutes.value + " minutos";
+                  }
+                }
+              } 
+            },
+        },
+      ],
+      columns: [
+        {
+          name: 'days',
+          prefix: 'Dias',
+          options: [
+            { text: '0', value: 0 },
+            { text: '1', value: 1 },
+            { text: '2', value: 2 },
+            { text: '3', value: 3 },
+            { text: '4', value: 4 },
+          ]
+        },
+        {
+          name: 'hours',
+          prefix: 'Horas',
+          options: [
+            { text: '0', value: 0 },
+            { text: '1', value: 1 },
+            { text: '2', value: 2 },
+            { text: '3', value: 3 },
+            { text: '4', value: 4 },
+            { text: '5', value: 5 },
+            { text: '6', value: 6 },
+            { text: '7', value: 7 },
+            { text: '8', value: 8 },
+          ]
+        },
+        {
+          name: 'minutes',
+          prefix: 'Minutos',
+          selectedIndex: 3,
+          options: [
+            { text: '0', value: 0 },
+            { text: '5', value: 5 },
+            { text: '10', value: 10 },
+            { text: '15', value: 15 },
+            { text: '20', value: 20 },
+            { text: '25', value: 25 },
+            { text: '30', value: 30 },
+            { text: '35', value: 35 },
+            { text: '45', value: 45 },
+            { text: '50', value: 50 },
+            { text: '55', value: 55 },
+          ]
+        }
+      ]
+    });
+    await picker.present();
+    picker.onDidDismiss().then(async data =>{
+      let day = await picker.getColumn('days');
+      let hour = await picker.getColumn('hours'); 
+      let minutes = await picker.getColumn('minutes');
+    });
+
+  }
+
+}
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 e44a2188c..0efa50774 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -52,8 +52,6 @@ export class ChatPopoverPage implements OnInit {
           console.log(res);
         });
       }
-
-
     });
     this.popoverController.dismiss(true);
   }
@@ -80,7 +78,7 @@ export class ChatPopoverPage implements OnInit {
     const modal = await this.modalController.create({
       component: EditGroupPage,
       componentProps: {
-        //room: this.room,
+        roomId: this.roomId,
       }, 
       cssClass: 'contacts',
       backdropDismiss: false

From 3e996c7cca8c60e912b5654ce636f1e6afb6e10c Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 14 Apr 2021 14:10:17 +0100
Subject: [PATCH 02/18] save

---
 src/app/pages/chat/chat.page.ts                          | 5 ++++-
 src/app/shared/chat/edit-group/edit-group.page.ts        | 3 ++-
 src/app/shared/popover/chat-popover/chat-popover.page.ts | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 7d81992a7..7fd4f2720 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -287,7 +287,10 @@ export class ChatPage implements OnInit {
       },
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then((res)=>{
+      console.log(res.data);
+      this.modalController.dismiss(res.data);
+    });
   }
 
   async openMessagesModal(roomId:any){
diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts
index 328b6df18..b6b98717c 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.ts
+++ b/src/app/shared/chat/edit-group/edit-group.page.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, NavParams, PickerController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
 
@@ -15,6 +15,7 @@ export class EditGroupPage implements OnInit {
   groupName:string;
   room:any;
   @Input() roomId:string;
+  @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private modalController: ModalController,
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 0efa50774..f25f8e3dd 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -75,6 +75,8 @@ export class ChatPopoverPage implements OnInit {
     this.popoverController.dismiss(true);
   }
   async openChangeGroupName(){
+
+    
     const modal = await this.modalController.create({
       component: EditGroupPage,
       componentProps: {

From 2499fe7794a02c2244f78928b3c6153026e96d1f Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 16 Apr 2021 11:25:10 +0100
Subject: [PATCH 03/18] alterar nome desktop

---
 src/app/pages/chat/chat.page.html             | 39 +++++++++++++++----
 .../btn-seguinte/btn-seguinte.page.html       |  6 ++-
 .../chat/edit-group/edit-group.page.html      | 14 ++++---
 .../chat/edit-group/edit-group.page.scss      | 14 +++----
 .../shared/chat/edit-group/edit-group.page.ts | 13 +++++--
 .../group-messages/group-messages.page.ts     |  6 ++-
 6 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 743f2003a..d67ffc9d0 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -94,17 +94,40 @@
       </div>
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">
-        <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>
-        <app-edit-group [roomId]="roomId" *ngIf="showEditGroup" class="d-flex height-100 flex-column"></app-edit-group>
-        <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
+        <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>
+        <app-edit-group [roomId]="roomId"
+          (closeAllDesktopComponents)="closeAllDesktopComponents()"
+          (openGroupMessage)="openGroupMessagesPage($event)" 
+          *ngIf="showEditGroup" class="d-flex height-100 flex-column">
+        </app-edit-group>
+        <app-group-contacts 
+          (openGroupMessage)="openGroupMessagesPage($event)" 
+          [roomId]="groupRoomId" class="d-flex height-100 flex-column" 
+          *ngIf="showGroupContacts">
+        </app-group-contacts>
         <app-group-messages
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           (showEmptyContainer)="showEmptyContainer()"
-          (openGroupContacts)="openGroupContactsPage($event)" 
-          *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
+          (openGroupContacts)="openGroupContactsPage($event)"
+          (openEditGroupPage)="openEditGroupPage($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/shared/btn-seguinte/btn-seguinte.page.html b/src/app/shared/btn-seguinte/btn-seguinte.page.html
index 526d8f40c..5bd4371f1 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.page.html
+++ b/src/app/shared/btn-seguinte/btn-seguinte.page.html
@@ -1,3 +1,5 @@
-<div class="right">
-  <ion-label>Seguinte</ion-label>
+<div>
+  <button class="btn-no-color right">
+    <ion-label>Seguinte</ion-label>
+  </button>
 </div>
\ No newline at end of file
diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/shared/chat/edit-group/edit-group.page.html
index 70ef13159..9d046bfe9 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.html
+++ b/src/app/shared/chat/edit-group/edit-group.page.html
@@ -3,7 +3,9 @@
     <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>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="middle">
           <ion-label class="title">Alterar assunto</ion-label>
@@ -14,9 +16,9 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content>
-  <div class="main-content">
-    <div class="item-container">
+<ion-content class="width-100">
+  <div class="main-content d-flex width-100">
+    <div class="item-container d-flex flex-column width-100">
       <ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
     </div>
     <div *ngIf="false" class="item-container-no-border">
@@ -24,8 +26,8 @@
       <ion-label>Grupo Ultra-secreto</ion-label>
     </div>
 
-    <div *ngIf="showDuration" class="container-div">
-      <div class="ion-item-class-2">
+    <div *ngIf="showDuration" class="container-div width-100">
+      <div class="ion-item-class-2 width-100">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-duration.svg"></ion-icon>
         </div>
diff --git a/src/app/shared/chat/edit-group/edit-group.page.scss b/src/app/shared/chat/edit-group/edit-group.page.scss
index 428f62e08..9dd7ea684 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.scss
+++ b/src/app/shared/chat/edit-group/edit-group.page.scss
@@ -6,7 +6,7 @@ ion-content{
    --opacity: 1;
 }
 .div-top-header{
-    width: 400px;
+    //width: 400px;
     margin: 0 auto;
     background-color: #0782c9;
     overflow: auto;
@@ -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;
@@ -92,8 +92,6 @@ ion-content{
  
   }
   .main-content{
-    width: 100%; /* 400px */
-    height: 100%;
     font-family: Roboto;
     margin: 0 auto;
     background-color: #fff;
@@ -101,7 +99,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 +108,7 @@ ion-content{
 
       .item-container-no-border{
         display: flex;
-        width: 360px;
+        //width: 360px;
         margin: 25px auto;
         border-radius: 5px;
         align-items: center;
@@ -128,7 +126,7 @@ ion-content{
     overflow: auto;
 
     .ion-item-class-2{
-        width: 360px;
+        //width: 360px;
         margin: 0px auto;
 
         .ion-icon-class{
@@ -140,7 +138,7 @@ ion-content{
           }
       }
       .ion-input-class{
-        width: 315px;
+        width: calc(100% - 45px);
         height: 45px;
         border: 1px solid #ebebeb;
         border-radius: 5px;
diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts
index b6b98717c..0674396eb 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.ts
+++ b/src/app/shared/chat/edit-group/edit-group.page.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ModalController, NavParams, PickerController } from '@ionic/angular';
+import { ModalController, PickerController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
 
 @Component({
@@ -16,12 +16,13 @@ export class EditGroupPage implements OnInit {
   room:any;
   @Input() roomId:string;
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
+  @Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private modalController: ModalController,
     private pickerController: PickerController,
     private chatService: ChatService,
-    private navParams: NavParams,
   ) {
    }
 
@@ -38,7 +39,9 @@ export class EditGroupPage implements OnInit {
   }
 
   close(){
-    this.modalController.dismiss();
+    //this.modalController.dismiss();
+    this.closeAllDesktopComponents.emit();
+    this.openGroupMessage.emit(this.roomId);
   }
 
   changeGroupName(){
@@ -54,8 +57,10 @@ export class EditGroupPage implements OnInit {
     }
     else{
       console.log("Invalid name!");
-    }  
+    }
+    this.close();  
   }
+
   _ionChange(event){
     this.showDuration = event.detail.checked;
   }
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 f85873c95..b1f3c1e75 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -30,7 +30,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
   @Output() showEmptyContainer:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
-  @Output() openEditGroup:EventEmitter<any> = new EventEmitter<any>();
+  @Output() openEditGroupPage:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
     private menu: MenuController,
@@ -210,7 +210,9 @@ export class GroupMessagesPage implements OnInit, OnChanges {
         console.log('CANCEL');
       }
       else if(res.data == 'edit'){
-        console.log('CANCEL');
+        console.log(this.roomId);
+        //this.closeAllDesktopComponents.emit();
+        this.openEditGroupPage.emit(this.roomId);
       }
       else{
         this.roomName = res.data.name.split('-').join(' ');

From f2727389cd613bc93c7b407e9df0c63747862711 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 16 Apr 2021 15:49:38 +0100
Subject: [PATCH 04/18] save

---
 src/app/pages/chat/new-group/new-group.page.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html
index b53fdda69..e615cd512 100644
--- a/src/app/pages/chat/new-group/new-group.page.html
+++ b/src/app/pages/chat/new-group/new-group.page.html
@@ -3,7 +3,9 @@
     <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>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="middle">
           <ion-label class="title">Novo Grupo</ion-label>

From 2c569fa72fca0aad56ff8bfc4b1f050499a0a069 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 16 Apr 2021 15:53:24 +0100
Subject: [PATCH 05/18] save

---
 src/app/pages/login/login.page.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 3e288ecf2..314331565 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -11,7 +11,7 @@ import { PhotoService } from 'src/app/services/photo.service';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Token } from '../../models/token.model';
-import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
 
@@ -40,7 +40,8 @@ export class LoginPage implements OnInit {
     private toastService: ToastService,
     private photoService: PhotoService,
     public alertController: AlertController,
-    private fcm: FCM) { }
+    //private fcm: FCM
+    ) { }
 
   ngOnInit() {
 

From 0b7dab5e8f369d9ab1e41222119aa9bc5739df93 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 19 Apr 2021 15:01:39 +0100
Subject: [PATCH 06/18] save

---
 src/app/pages/login/login.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 314331565..2e19bad9b 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -99,7 +99,7 @@ export class LoginPage implements OnInit {
       }
       if (await this.authService.login(this.userattempt)) {
         this.loginRocketChat();
-        this.getToken();
+        //this.getToken();
 
         this.router.navigate(['/home/events']);
       }

From 77075b34737f845a5b62aa6931c8c90299726121 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 00:28:16 +0100
Subject: [PATCH 07/18] swipe-delete button

---
 package-lock.json                             |  3 +--
 package.json                                  |  2 +-
 .../group-contacts/group-contacts.page.html   | 19 +++++++++++-----
 .../group-contacts/group-contacts.page.scss   | 17 +++++++++++---
 .../group-contacts/group-contacts.page.ts     | 22 +++++++++++++++++++
 src/app/pages/login/login.page.ts             |  2 +-
 src/app/services/chat.service.ts              | 18 +++++++++++++++
 7 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88a50acfd..228bc2678 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17290,8 +17290,7 @@
         },
         "ssri": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "resolved": "",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"
diff --git a/package.json b/package.json
index 4811311de..386204484 100644
--- a/package.json
+++ b/package.json
@@ -138,4 +138,4 @@
     "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
   },
   "license": "ISC"
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
index 7b473c119..09dfeb3d2 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -3,7 +3,9 @@
     <div class="main-header">
       <div class="title-content">
         <div class="back-icon">
-          <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="close()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
@@ -33,11 +35,16 @@
     <div *ngIf="members">
       <ion-label class="members-label">Contactos selecção:</ion-label>
       <ion-list class="members-list" *ngFor="let user of members">
-        <div class="members-checkbox">
-          <ion-checkbox checked color="primary"></ion-checkbox>
-          <p>{{user.name}}</p>
-          <ion-icon class="{{user.status}}" name="ellipse"></ion-icon>
-        </div>
+        <ion-item-sliding>
+          <ion-item lines="none" class="members-checkbox ion-no-border ion-no-padding">
+            <ion-checkbox checked color="primary"></ion-checkbox>
+            <p>{{user.name}}</p>
+            <ion-icon class="{{user.status}}" name="ellipse"></ion-icon>
+          </ion-item>
+          <ion-item-options (click)="deleteMember(user)" class="members-options" side="end">
+            <ion-item-option color="danger">Apagar</ion-item-option>
+          </ion-item-options>
+      </ion-item-sliding>
       </ion-list>
     </div>
 
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
index b6e007730..7879b0cae 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
@@ -93,10 +93,15 @@
 
     .members-checkbox{
       display: flex;
-      margin: .5px 20px .5px 20px !important;
+      margin: 0px 20px 0px 20px !important;
       overflow: auto;
       align-items: center;
+      border-bottom: 1px solid #ebebeb;
+    }
 
+    .members-options{
+      margin: 0px 20px 0px 19px !important;
+      overflow: auto;
     }
     
     .item-divider{
@@ -114,11 +119,17 @@
        align-items: center;
  
      }
+
+     .members-checkbox ion-checkbox{
+      --border-color: #0d89d1;
+      --background-checked:#0d89d1;
+      float: left;
+  }
  
-     .item-checkbox ion-checkbox, .members-checkbox ion-checkbox{
+     .item-checkbox ion-checkbox{
          --border-color: #0d89d1;
          --background-checked:#0d89d1;
-         float: left;
+         float: left;  
      }
  
      .item-checkbox p, .members-checkbox p{
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index c1fdc3618..682e002a8 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -57,6 +57,28 @@ export class GroupContactsPage implements OnInit {
     console.log(this.isGroupCreated);
   }
 
+  deleteMember(data:any){
+    let body = {
+      "roomId": this.room._id,
+      "userId": data._id,
+    }
+    console.log(this.room);
+    
+    console.log(body);
+    if(this.room.t == "p"){
+      this.chatService.removeGroupMember(body).subscribe(res=>{
+        console.log(res);
+        this.loadUsers();
+      });
+    }
+    else if(this.room.t == "c"){
+      this.chatService.removeChannelMember(body).subscribe(res=>{
+        console.log(res);
+        this.loadUsers();
+      });
+    }
+  }
+
   loadUsers(){
     this.options = { 
       headers: this.headers,
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 3e288ecf2..2aaefbe54 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -98,7 +98,7 @@ export class LoginPage implements OnInit {
       }
       if (await this.authService.login(this.userattempt)) {
         this.loginRocketChat();
-        this.getToken();
+        //this.getToken();
 
         this.router.navigate(['/home/events']);
       }
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 6d68c7b70..b221f27a9 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -119,6 +119,12 @@ export class ChatService {
       }
       return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts);
     }
+    leaveRoom(body:any){
+      let opts = { 
+        headers: this.headers,
+      }
+      return this.http.post(environment.apiChatUrl+'rooms.leave', body, opts);
+    }
     //Load members from a chat
     getMembers(roomId:any){
 
@@ -205,6 +211,12 @@ export class ChatService {
     closeChannel(body:any){
       return this.http.post(environment.apiChatUrl+'channels.close', body, this.options);
     }
+    removeChannelMember(body:any){
+      let opts = { 
+        headers: this.headers,
+      }
+      return this.http.post(environment.apiChatUrl+'channels.kick', body, opts);
+    }
     deleteGroup(body:any){
       return this.http.post(environment.apiChatUrl+'groups.delete', body, this.options);
     }
@@ -227,5 +239,11 @@ export class ChatService {
     renameGroup(body:any){
       return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options);
     }
+    removeGroupMember(body:any){
+      let opts = { 
+        headers: this.headers,
+      }
+      return this.http.post(environment.apiChatUrl+'groups.kick', body, opts);
+    }
 
 }

From d7e2f96c2cde9b0184fef97c5be053c7dde72bd3 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 13:22:25 +0100
Subject: [PATCH 08/18] save

---
 .../group-contacts/group-contacts.page.ts     | 25 ++++++++---
 .../group-contacts/group-contacts.page.html   |  7 ++-
 .../group-contacts/group-contacts.page.scss   | 16 +++++++
 .../group-contacts/group-contacts.page.ts     | 43 +++++++++++++++++++
 4 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index 682e002a8..69e8717be 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -53,6 +53,7 @@ export class GroupContactsPage implements OnInit {
 
   ngOnInit() {
     this.loadUsers();
+    this.getMembers();
     console.log(this.groupName);
     console.log(this.isGroupCreated);
   }
@@ -62,23 +63,35 @@ export class GroupContactsPage implements OnInit {
       "roomId": this.room._id,
       "userId": data._id,
     }
-    console.log(this.room);
-    
     console.log(body);
     if(this.room.t == "p"){
       this.chatService.removeGroupMember(body).subscribe(res=>{
         console.log(res);
-        this.loadUsers();
+        this.getMembers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.removeChannelMember(body).subscribe(res=>{
         console.log(res);
-        this.loadUsers();
+        this.getMembers();
       });
     }
   }
 
+  getMembers(){
+    if(this.room.t == "p"){
+      this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
+        this.members = res['members'];
+      });
+    }
+    else if(this.room.t == "c"){
+      this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
+        this.members = res['members'];
+      });
+    }
+  }
+
+
   loadUsers(){
     this.options = { 
       headers: this.headers,
@@ -90,7 +103,6 @@ export class GroupContactsPage implements OnInit {
       else{
         this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
       }
-      
       this.users = this.contacts.sort((a,b) => {
         if(a.name < b.name){
           return -1;
@@ -121,7 +133,8 @@ export class GroupContactsPage implements OnInit {
   }
 
   doRefresh(event){
-
+    this.loadUsers();
+    this.getMembers();
   }
 
   async close(){
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 c0f241913..02ae52460 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,7 +3,9 @@
     <div class="main-header width-100">
       <div class="title-content width-100">
         <div class="back-icon">
-          <ion-icon (click)="openGroupMessagesPage()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color" (click)="openGroupMessagesPage()">
+            <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </button>
         </div>
         <div class="div-title">
           <ion-label class="title">Contactos</ion-label>
@@ -34,6 +36,9 @@
           <ion-checkbox checked color="primary"></ion-checkbox>
           <p>{{user.name}}</p>
           <ion-icon  class="{{user.status}}" name="ellipse"></ion-icon>
+          <button (click)="deleteMember(user)" class="btn-no-color detele-item-icon">
+            <ion-icon color="danger" name="close"></ion-icon>
+          </button>
         </div>
       </ion-list>
     </div>
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 b681605ce..a2f88e2f3 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
@@ -102,6 +102,22 @@
       overflow: auto;
       align-items: center;
 
+      .detele-item-icon{
+        display: none;
+        width: 30px;
+        margin-left: 15px;
+      }
+  
+      .detele-item-icon ion-icon{
+        font-size: 20px !important;
+      }
+    }
+
+    .members-checkbox:hover{
+      .detele-item-icon{
+        display: flex;
+        justify-content: flex-end;
+      }
     }
     
     .item-divider{
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 3b6091d09..b186a88a0 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,49 @@ export class GroupContactsPage implements OnInit {
       this.getGroupContacts(room['room']);
     });
   }
+  deleteMember(data:any){
+    console.log(data);
+    
+    let body = {
+      "roomId": this.roomId,
+      "userId": data._id,
+    }
+    console.log(body);
+    this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
+      if(room['room'].t == "p"){
+        this.chatService.removeGroupMember(body).subscribe(res=>{
+          console.log(res);
+          this.getMembers();
+          this.getChatInfo();
+        });
+      }
+      else if(room['room'].t == "c"){
+        this.chatService.removeChannelMember(body).subscribe(res=>{
+          console.log(res);
+          this.getMembers();
+          this.getChatInfo();
+        });
+      }
+    });
+  }
+
+  getMembers(){
+    this.chatService.getRoomInfo(this.roomId).subscribe(res=>{
+      console.log(res);
+      let room = res['room'];
+      
+      if(room.t == "p"){
+        this.chatService.getGroupMembers(this.roomId).subscribe(res=>{
+          this.members = res['members'];
+        });
+      }
+      else if(room.t == "c"){
+        this.chatService.getChannelMembers(this.roomId).subscribe(res=>{
+          this.members = res['members'];
+        });
+      }
+    });
+  }
 
   getGroupContacts(room:any){
     this.showLoader = true;

From 24ab72b0fe6d23f173a6f3cbe493052ae3001278 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 13:40:55 +0100
Subject: [PATCH 09/18] save

---
 .../chat/group-messages/group-contacts/group-contacts.page.ts   | 2 ++
 src/app/pages/events/attendees/attendees.page.html              | 1 -
 .../chat/group-messages/group-contacts/group-contacts.page.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index 69e8717be..d80344e0e 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -68,12 +68,14 @@ export class GroupContactsPage implements OnInit {
       this.chatService.removeGroupMember(body).subscribe(res=>{
         console.log(res);
         this.getMembers();
+        this.loadUsers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.removeChannelMember(body).subscribe(res=>{
         console.log(res);
         this.getMembers();
+        this.loadUsers();
       });
     }
   }
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index e17f9782f..3b5d2c8b1 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -27,7 +27,6 @@
     </ion-list>
     <hr/>
 
-    
     <ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
       <div  class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1"  > Destinatário</div> 
       <ion-item-sliding class="px-20"> 
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 02ae52460..ae052752e 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
@@ -33,7 +33,7 @@
       <ion-label class="members-label">Contactos selecção:</ion-label>
       <ion-list class="members-list" *ngFor="let user of members">
         <div class="members-checkbox">
-          <ion-checkbox checked color="primary"></ion-checkbox>
+          <ion-checkbox disabled checked color="primary"></ion-checkbox>
           <p>{{user.name}}</p>
           <ion-icon  class="{{user.status}}" name="ellipse"></ion-icon>
           <button (click)="deleteMember(user)" class="btn-no-color detele-item-icon">

From e938fab0b6b53a0de1c08e8fb0413deab72bb865 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 13:51:51 +0100
Subject: [PATCH 10/18] save

---
 src/app/pages/login/login.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 2e19bad9b..c21cbe02c 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -10,7 +10,7 @@ import { AuthConnstants } from 'src/app/config/auth-constants';
 import { PhotoService } from 'src/app/services/photo.service';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Token } from '../../models/token.model';
+//import { Token } from '../../models/token.model';
 //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';

From f4f9d7fa56c8bd950abf731f12856059c4121b22 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 14:30:06 +0100
Subject: [PATCH 11/18] save

---
 .../group-messages/group-contacts/group-contacts.page.ts   | 7 ++++---
 .../group-messages/group-contacts/group-contacts.page.ts   | 4 ++--
 src/theme/variables.scss                                   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index d80344e0e..3219a3666 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -68,14 +68,12 @@ export class GroupContactsPage implements OnInit {
       this.chatService.removeGroupMember(body).subscribe(res=>{
         console.log(res);
         this.getMembers();
-        this.loadUsers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.removeChannelMember(body).subscribe(res=>{
         console.log(res);
         this.getMembers();
-        this.loadUsers();
       });
     }
   }
@@ -84,11 +82,13 @@ export class GroupContactsPage implements OnInit {
     if(this.room.t == "p"){
       this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
+        this.loadUsers();
       });
     }
     else if(this.room.t == "c"){
       this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
         this.members = res['members'];
+        this.loadUsers();
       });
     }
   }
@@ -134,9 +134,10 @@ export class GroupContactsPage implements OnInit {
     return null;
   }
 
-  doRefresh(event){
+  doRefresh(ev){
     this.loadUsers();
     this.getMembers();
+    ev.target.complete();
   }
 
   async close(){
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 b186a88a0..f2b21fe3f 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
@@ -221,8 +221,8 @@ export class GroupContactsPage implements OnInit {
     return null;
   }
 
-  doRefresh(event){
-
+  doRefresh(ev){
+    ev.target.complete();
   }
 
   async close(){
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 66fa65889..1300d7c22 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -265,7 +265,7 @@
   background: rgba(51, 51, 51, 0.3); 
 }
 .modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{
-  padding-top: 75px;
+  padding-top: 65px;
   --border-radius: 25px 25px 0 0;
   --border-width:0px;
 }

From 83ad684a8dc6e6db08e5f97f646f925644687ed4 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 15:00:05 +0100
Subject: [PATCH 12/18] save

---
 .../chat/group-messages/group-contacts/group-contacts.page.ts  | 3 +--
 1 file changed, 1 insertion(+), 2 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 f2b21fe3f..e52bc1165 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
@@ -243,10 +243,9 @@ export class GroupContactsPage implements OnInit {
         backdropDismiss: false,
       });
       await modal.present();
-
     }
-
   }
+
   onChange(event){
     this.textSearch = event.detail.value;
   }

From 55a15e4c14f16c2b203ad48f9d97c49940f14616 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 17:18:57 +0100
Subject: [PATCH 13/18] leave group finished

---
 .../group-messages/group-messages.page.html    |  3 +++
 .../group-messages/group-messages.page.scss    | 18 ++++++++++++++++++
 .../chat/group-messages/group-messages.page.ts |  6 +++++-
 src/app/services/chat.service.ts               |  6 ++++++
 .../group-messages/group-messages.page.html    |  3 +++
 .../group-messages/group-messages.page.scss    | 18 ++++++++++++++++++
 .../chat/group-messages/group-messages.page.ts |  4 ++--
 .../popover/chat-popover/chat-popover.page.ts  |  4 ++--
 8 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index e9dce4ed3..263877ca7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -51,6 +51,9 @@
       <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
     </div>
   </div>
+  <div *ngIf="leaveStatus" class="info-text-leave">
+    <ion-label>{{leaveStatus}}</ion-label>
+  </div>
 
 </ion-content>
 <!-- 
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index f1acc3533..f94b3c8e6 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -103,6 +103,24 @@
     /* margin: 15px 0px 15px 0px; */
     border-radius: 8px;
    }
+   .info-text-leave{
+     display: flex;
+     align-items: center;
+     justify-content: center;
+     width: fit-content;
+    padding: 10px;
+    background: #e0e9ee;
+    border-radius: 8px;
+    margin: 10px auto;
+    color: #797979 !important;
+    font-size: 13px !important;
+    /* margin: 15px 0px 15px 0px; */
+
+    .info-text-leave ion-label{
+      font-size: 13px !important;
+      line-height: 1.2rem;
+    }
+   }
    .messages{
     font-size: 13px;
     font-family: Roboto;
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index d5e3e9cda..3ff8ad91c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -19,6 +19,7 @@ export class GroupMessagesPage implements OnInit {
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
+  leaveStatus:any;
   messages:any;
   
 
@@ -145,9 +146,12 @@ export class GroupMessagesPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(res=>{
+      if(res.data == 'leave'){
+        this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
+      }
       console.log('OK2');
       
-      console.log(res);
+      console.log(res.data);
       /* if(res.data ==){
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index b221f27a9..91983ff7f 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -211,6 +211,12 @@ export class ChatService {
     closeChannel(body:any){
       return this.http.post(environment.apiChatUrl+'channels.close', body, this.options);
     }
+    leaveGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.leave', body, this.options);
+    }
+    leaveChannel(body:any){
+      return this.http.post(environment.apiChatUrl+'channels.leave', body, this.options);
+    }
     removeChannelMember(body:any){
       let opts = { 
         headers: this.headers,
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 5e06ea714..43682e735 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -52,6 +52,9 @@
       </div>
     </div>
   </div>
+  <div *ngIf="leaveStatus" class="info-text-leave">
+    <ion-label>{{leaveStatus}}</ion-label>
+  </div>
 
 </ion-content>
 
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 517a2659c..1d3a14713 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -97,6 +97,24 @@
     /* margin: 15px 0px 15px 0px; */
     border-radius: 8px;
    }
+   .info-text-leave{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: fit-content;
+   padding: 10px;
+   background: #e0e9ee;
+   border-radius: 8px;
+   margin: 10px auto;
+   color: #797979 !important;
+   font-size: 13px !important;
+   /* margin: 15px 0px 15px 0px; */
+
+   .info-text-leave ion-label{
+     font-size: 13px !important;
+     line-height: 1.2rem;
+   }
+  }
    .messages{
     font-size: 13px;
     font-family: Roboto;
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 b1f3c1e75..2bbbf2b45 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -19,6 +19,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
+  leaveStatus:any;
   messages:any;
   
 
@@ -199,8 +200,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     modal.onDidDismiss().then(res=>{
       console.log(res);
       if(res.data == 'leave'){
-        console.log('LEAVE');
-        
+        this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
       }
       else if(res.data == 'delete'){
         this.closeAllDesktopComponents.emit();
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 ccbd9d7ab..b3a18e6f2 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -46,12 +46,12 @@ export class ChatPopoverPage implements OnInit {
       this.room = room['room'];
 
       if(this.room.t === 'p'){ 
-        this.chatService.closeGroup(body).subscribe(res=>{
+        this.chatService.leaveGroup(body).subscribe(res=>{
           console.log(res);
         });
       }
       else{ 
-        this.chatService.closeChannel(body).subscribe(res=>{
+        this.chatService.leaveChannel(body).subscribe(res=>{
           console.log(res);
         });
       }

From 28a3a40a4b3d4596dab387eabbd42837f9865eb0 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 17:36:25 +0100
Subject: [PATCH 14/18] save

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

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 3ff8ad91c..d2ecd047a 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -21,7 +21,6 @@ export class GroupMessagesPage implements OnInit {
   message:any;
   leaveStatus:any;
   messages:any;
-  
 
   room:any;
   roomName:any;

From 4d6d7b95f2bda465e463a80202fbe5641cb3239e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 21 Apr 2021 09:25:35 +0100
Subject: [PATCH 15/18] save

---
 src/app/pages/chat/chat.page.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 29b743bda..a16a19aa6 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -266,7 +266,6 @@ export class ChatPage implements OnInit {
     const modal = await this.modalController.create({
       component: ContactsPage,
       cssClass: 'contacts',
-      backdropDismiss: false,
     });
     await modal.present();
     modal.onDidDismiss();
@@ -275,7 +274,6 @@ export class ChatPage implements OnInit {
     const modal = await this.modalController.create({
       component: NewGroupPage,
       cssClass: 'new-group',
-      backdropDismiss: false,
     });
     await modal.present();
     modal.onDidDismiss();
@@ -310,7 +308,6 @@ export class ChatPage implements OnInit {
     const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: classs,
-      backdropDismiss: false,
       componentProps: {
         roomId: roomId,
       },
@@ -331,7 +328,6 @@ export class ChatPage implements OnInit {
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
       cssClass: classs,
-      backdropDismiss: false,
       componentProps: {
         roomId: roomId,
       },

From 75c51fd8687fd2c8c7c1cf4e3959f72d3d5d367c Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 21 Apr 2021 09:45:26 +0100
Subject: [PATCH 16/18] save

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

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index d2ecd047a..f8fe884c8 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -66,7 +66,6 @@ export class GroupMessagesPage implements OnInit {
     });
   }
 
-
   /* load(){
     this.getGroupContacts();
     this.loadGroupMessages();

From b58e14b0dcaad5a767ca650080c04c7eacb52f67 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 22 Apr 2021 09:35:13 +0100
Subject: [PATCH 17/18] fix book-meeting

---
 src/app/app-routing.module.ts                 |   4 +
 .../book-meeting-modal.page.ts                |   2 +-
 .../gabinete-digital.module.ts                |   3 +
 .../gabinete-digital.page.html                |   5 +-
 .../gabinete-digital/gabinete-digital.page.ts |  13 ++
 src/app/services/events.service.ts            |   3 +-
 .../expedients/expedients.page.ts             |   1 +
 .../pedidos/pedidos-routing.module.ts         |  17 ++
 .../pedidos/pedidos.module.ts                 |  20 ++
 .../pedidos/pedidos.page.html                 |  91 +++++++++
 .../pedidos/pedidos.page.scss                 | 177 ++++++++++++++++++
 .../pedidos/pedidos.page.spec.ts              |  24 +++
 .../gabinete-digital/pedidos/pedidos.page.ts  | 110 +++++++++++
 13 files changed, 466 insertions(+), 4 deletions(-)
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos-routing.module.ts
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos.module.ts
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos.page.html
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos.page.spec.ts
 create mode 100644 src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index bb288f651..bb68a511f 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -43,6 +43,10 @@ const routes: Routes = [
     path: 'edit-group',
     loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
   },
+  {
+    path: 'pedidos',
+    loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 07d5901fe..a2ebdce27 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -112,7 +112,7 @@ export class BookMeetingModalPage implements OnInit {
 
     this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
       if(res){
-        this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber);
+        this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber, this.task.FsId);
       } 
     });
     this.distartExpedientModal();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 6eca51583..795060ec6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -14,6 +14,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain
 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 { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
 
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
@@ -32,12 +33,14 @@ import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/exped
     EventsToApprovePage,
     ExpedientePage,
     ExpedientsPage,
+    PedidosPage,
   ],
   entryComponents: [
     EmptyContainerPage,
     EventsToApprovePage,
     ExpedientePage,
     ExpedientsPage,
+    PedidosPage,
   ],
   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 b2791351e..2e862a2f5 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -45,7 +45,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer')">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-parecer.svg"></ion-icon>
             </div>
@@ -53,7 +53,7 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
-          <div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+          <div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento')">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
             </div>
@@ -130,6 +130,7 @@
         
         <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>
+        <app-pedidos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
       
 
       </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index a78e5fe3d..8480865d4 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -37,6 +37,7 @@ export class GabineteDigitalPage implements OnInit {
   showEventsToApprove = false;
   showEmptyContainer = false;
   showExpedients = true;
+  showPedidos = false;
   showExpedientDetail = false;
   emptyTextDescription = 'Sem opção selecionada';
 
@@ -111,6 +112,7 @@ export class GabineteDigitalPage implements OnInit {
     this.showEventsToApprove = false;
     this.showExpedients = false;
     this.showExpedients = false;
+    this.showPedidos = false;
     this.showExpedientDetail = false;
   }
 
@@ -204,6 +206,17 @@ export class GabineteDigitalPage implements OnInit {
     }
   }
 
+  openPedidosPage(segment:string){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      this.openExpedientList();
+    }
+    else{
+      this.segment = segment;
+      this.showPedidos = true;
+    }
+  }
+
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 61639e7a8..817304a39 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -191,12 +191,13 @@ export class EventsService {
     
     return this.http.delete(`${puturl}`, options)
   }
-  postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any){
+  postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
     const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/event';
     let params = new HttpParams();
 
     params = params.set("DocId", docId);
     params = params.set("SerialNumber", serialNumber);
+    params = params.set("applicationID", applicationID);
 
     let options = { 
       headers: this.headers,
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 3ea384556..61e175436 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -52,6 +52,7 @@ export class ExpedientsPage implements OnInit {
 
   LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      console.log(result);
       this.taskslist = new Array();
       let res = result.reverse();
       res.forEach(element => {
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos-routing.module.ts b/src/app/shared/gabinete-digital/pedidos/pedidos-routing.module.ts
new file mode 100644
index 000000000..27d14b94e
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { PedidosPage } from './pedidos.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: PedidosPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PedidosPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts
new file mode 100644
index 000000000..bd2b3de89
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.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 { PedidosPageRoutingModule } from './pedidos-routing.module';
+
+import { PedidosPage } from './pedidos.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    PedidosPageRoutingModule
+  ],
+  declarations: [PedidosPage]
+})
+export class PedidosPageModule {}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
new file mode 100644
index 000000000..61159c3b3
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -0,0 +1,91 @@
+<ion-header class="ion-no-border">
+  <div class="title">
+    <div class="thetitle"><ion-label >Pedidos</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment">
+      <ion-segment-button value="parecer">
+        Pedidos de Parecer
+      </ion-segment-button>
+      <ion-segment-button value="deferimento" (click)="notImplemented()">
+        Pedidos de Defereimento
+      </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="'parecer'">
+      <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="'deferimento'">
+      <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/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
new file mode 100644
index 000000000..cbf52c39c
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -0,0 +1,177 @@
+@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;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+.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{
+  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/pedidos/pedidos.page.spec.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.spec.ts
new file mode 100644
index 000000000..3b94a96d9
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { PedidosPage } from './pedidos.page';
+
+describe('PedidosPage', () => {
+  let component: PedidosPage;
+  let fixture: ComponentFixture<PedidosPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PedidosPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(PedidosPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
new file mode 100644
index 000000000..a35d45180
--- /dev/null
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -0,0 +1,110 @@
+import { Component, EventEmitter, Input, OnInit, Output, 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';
+import { AlertService } from 'src/app/services/alert.service';
+
+@Component({
+  selector: 'app-pedidos',
+  templateUrl: './pedidos.page.html',
+  styleUrls: ['./pedidos.page.scss'],
+})
+export class PedidosPage implements OnInit {
+  
+  //profile:string;
+
+  @ViewChild(CalendarComponent) myCal: CalendarComponent;
+
+  taskslist:DailyWorkTask[];
+  serialNumber:string;
+
+  @Input() profile:string;
+  @Input() segment:string;
+  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    private alertService: AlertService,
+    ) { 
+      this.profile = 'mdgpr';
+    }
+
+  ngOnInit() {
+    //Inicializar segment
+    this.LoadList();
+  }
+
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
+
+  openExpedientDetailPage(data){
+    console.log(data);
+    this.openExpedientDetail.emit(data);
+  }
+
+  LoadList(){
+    this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+      console.log(result);
+      
+      this.taskslist = new Array();
+      let res = result.reverse();
+      res.forEach(element => {
+        let task: DailyWorkTask = {
+          "SerialNumber": element.serialNumber,
+          "Folio": element.workflowInstanceDataFields.Subject,
+          "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);
+      });
+      console.log(this.taskslist);
+      
+    });
+  }
+
+  doRefresh(event) {
+    this.LoadList();
+
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
+
+  async viewExpedientDetail(serialNumber:any) {
+    console.log(this.profile);
+
+    let classs;
+    if( window.innerWidth <= 800){
+      classs = 'modal'
+    } else  {
+      classs = 'modal modal-desktop'
+    }
+
+    const modal = await this.modalController.create({
+      component: ExpedienteDetailPage,
+      componentProps:{
+        enterAnimation: "",
+        serialNumber: serialNumber,
+        profile: this.profile,
+      },
+      cssClass: classs,
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res)=>{
+      console.log('refresh list');
+      this.LoadList();
+    });
+  }
+
+}
+  
\ No newline at end of file

From c02c5ba2608824447b42a7747b90e493b7687644 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 22 Apr 2021 11:02:44 +0100
Subject: [PATCH 18/18] improvements

---
 src/app/app-routing.module.ts                 |   4 +
 .../gabinete-digital.module.ts                |   3 +
 .../gabinete-digital.page.html                |  29 ++-
 .../gabinete-digital/gabinete-digital.page.ts |  29 ++-
 .../despachos/despachos-routing.module.ts     |  17 ++
 .../despachos/despachos.module.ts             |  20 ++
 .../despachos/despachos.page.html             |  85 +++++++++
 .../despachos/despachos.page.scss             | 177 ++++++++++++++++++
 .../despachos/despachos.page.spec.ts          |  24 +++
 .../despachos/despachos.page.ts               | 115 ++++++++++++
 .../pedidos/pedidos.page.html                 |  89 +++++----
 .../pedidos/pedidos.page.scss                 |   4 +-
 .../gabinete-digital/pedidos/pedidos.page.ts  |  70 +++++--
 13 files changed, 603 insertions(+), 63 deletions(-)
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos-routing.module.ts
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos.module.ts
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos.page.html
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos.page.scss
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos.page.spec.ts
 create mode 100644 src/app/shared/gabinete-digital/despachos/despachos.page.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index bb68a511f..9a6bf1379 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -47,6 +47,10 @@ const routes: Routes = [
     path: 'pedidos',
     loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
   },
+  {
+    path: 'despachos',
+    loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
+  },
 
  /*  {
     path: 'chat',
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 795060ec6..78f640dfd 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -15,6 +15,7 @@ import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-a
 import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page';
 import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
 import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
+import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despachos.page';
 
 /* import { ComponentsModule } from 'src/app/components/components.module'; */
 
@@ -34,6 +35,7 @@ import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.pag
     ExpedientePage,
     ExpedientsPage,
     PedidosPage,
+    DespachosPage,
   ],
   entryComponents: [
     EmptyContainerPage,
@@ -41,6 +43,7 @@ import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.pag
     ExpedientePage,
     ExpedientsPage,
     PedidosPage,
+    DespachosPage,
   ],
   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 2e862a2f5..a976a6879 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -45,12 +45,20 @@
             <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
           </div>
 
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage()">
+            <div class="d-flex justify-center">
+              <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+            </div>
+            <p class="text-center exp-card-title ">Despachos</p>
+            <p class="text-center exp-card-content">{{count_desp_dailywork}}<span class="title1">Documentos</span> </p>
+          </div>
+
           <div [class.active]="selectedElement == 'RequestsForOpinion'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('parecer')">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-expediente-parecer.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Pedidos de Parecer</p>
-            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
+            <p class="text-center exp-card-content">{{count_par_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
           <div [class.active]="selectedElement == 'RequestForApproval'" class="exp-card d-flex flex-column justify-center" (click)="openPedidosPage('deferimento')">
@@ -58,15 +66,7 @@
               <ion-icon  src="assets/images/icons-expediente-deferimento.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
-            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
-          </div>
-
-          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
-            <div class="d-flex justify-center">
-              <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-            </div>
-            <p class="text-center exp-card-title ">Diplomas por Validar</p>
-            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
+            <p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
           </div>
 
           <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
@@ -109,6 +109,14 @@
             </div>
           </div>
 
+          <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
+            <div class="d-flex justify-center">
+              <ion-icon  src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+            </div>
+            <p class="text-center exp-card-title ">Diplomas por Validar</p>
+            <p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
+          </div>
+
           <div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
             <div class="d-flex justify-center">
               <ion-icon  src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
@@ -131,6 +139,7 @@
         <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>
         <app-pedidos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
+        <app-despachos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachos"></app-despachos>
       
 
       </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 8480865d4..e0d3efae8 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -18,7 +18,10 @@ export class GabineteDigitalPage implements OnInit {
   showLoader: boolean;
   public profile:string;
 
-  count_exp_dailywork=0;  
+  count_exp_dailywork=0; 
+  count_desp_dailywork=0; 
+  count_par_dailywork=0; 
+  count_def_dailywork=0; 
   count_exp_pp : string;
   count_exp_pd : string;
   count_dip_apr : string;
@@ -38,6 +41,7 @@ export class GabineteDigitalPage implements OnInit {
   showEmptyContainer = false;
   showExpedients = true;
   showPedidos = false;
+  showDespachos = false;
   showExpedientDetail = false;
   emptyTextDescription = 'Sem opção selecionada';
 
@@ -113,6 +117,7 @@ export class GabineteDigitalPage implements OnInit {
     this.showExpedients = false;
     this.showExpedients = false;
     this.showPedidos = false;
+    this.showDespachos = false;
     this.showExpedientDetail = false;
   }
 
@@ -122,6 +127,18 @@ export class GabineteDigitalPage implements OnInit {
       this.showLoader = false;
       this.count_exp_dailywork = res;
     });
+    this.processesbackend.GetTasksList("Despacho", true).subscribe(res =>{
+      this.showLoader = false;
+      this.count_desp_dailywork = res;
+    });
+    this.processesbackend.GetTasksList("Pedido de Parecer", true).subscribe(res =>{
+      this.showLoader = false;
+      this.count_par_dailywork = res;
+    });
+    this.processesbackend.GetTasksList("Pedido de Deferimento", true).subscribe(res =>{
+      this.showLoader = false;
+      this.count_def_dailywork = res;
+    });
     this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
       this.count_ev_pr = res; 
     });
@@ -217,6 +234,16 @@ export class GabineteDigitalPage implements OnInit {
     }
   }
 
+  openDespachosPage(segment:string){
+    this.closeAllDesktopComponents();
+    if( window.innerWidth <= 1024){
+      this.openExpedientList();
+    }
+    else{
+      this.showDespachos = true;
+    }
+  }
+
   async openExpedientList(){
     
     this.closeAllDesktopComponent();
diff --git a/src/app/shared/gabinete-digital/despachos/despachos-routing.module.ts b/src/app/shared/gabinete-digital/despachos/despachos-routing.module.ts
new file mode 100644
index 000000000..9d8da06a2
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosPage } from './despachos.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachosPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachosPageRoutingModule {}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.module.ts b/src/app/shared/gabinete-digital/despachos/despachos.module.ts
new file mode 100644
index 000000000..848f0659a
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos.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 { DespachosPageRoutingModule } from './despachos-routing.module';
+
+import { DespachosPage } from './despachos.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DespachosPageRoutingModule
+  ],
+  declarations: [DespachosPage]
+})
+export class DespachosPageModule {}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
new file mode 100644
index 000000000..c7ec589fd
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -0,0 +1,85 @@
+<ion-header class="ion-no-border">
+  <div class="title">
+    <div class="thetitle"><ion-label >Despacho</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+      <ion-segment-button value="despachos">
+        Lista de despachos
+      </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">
+    <div *ngIf="despachoList">
+      <ion-list *ngSwitchCase="'despachos'">
+        <ion-item 
+            class="expediente ion-no-padding"  
+            *ngFor = "let task of despachoList"
+            >
+            <!-- (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>
+
+    </div>
+  </div>
+  <div *ngIf="!despachoList">
+  
+    <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/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
new file mode 100644
index 000000000..e624d0744
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
@@ -0,0 +1,177 @@
+@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;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .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: hidden;
+  }
+.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{
+  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/despachos/despachos.page.spec.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.spec.ts
new file mode 100644
index 000000000..efae597ec
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPage } from './despachos.page';
+
+describe('DespachosPage', () => {
+  let component: DespachosPage;
+  let fixture: ComponentFixture<DespachosPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachosPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachosPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
new file mode 100644
index 000000000..b12d320c1
--- /dev/null
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -0,0 +1,115 @@
+import { Component, EventEmitter, Input, OnInit, Output, 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';
+import { AlertService } from 'src/app/services/alert.service';
+
+@Component({
+  selector: 'app-despachos',
+  templateUrl: './despachos.page.html',
+  styleUrls: ['./despachos.page.scss'],
+})
+export class DespachosPage implements OnInit {
+ //profile:string;
+
+ @ViewChild(CalendarComponent) myCal: CalendarComponent;
+
+ taskslist:DailyWorkTask[];
+ despachoList:DailyWorkTask[];
+ deferimentoList:DailyWorkTask[];
+ taskType: string;
+ serialNumber:string;
+
+ @Input() profile:string;
+ segment:string;
+ @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+
+ constructor(
+   private processes:ProcessesService,
+   private modalController: ModalController,
+   private alertService: AlertService,
+   ) { 
+     this.profile = 'mdgpr';
+   }
+
+ ngOnInit() {
+   //Inicializar segment
+   this.segment = "despachos";
+   this.LoadList();
+ }
+ segmentChanged(ev: any) {
+   this.LoadList();
+ }
+
+ notImplemented(){
+   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ }
+
+ openExpedientDetailPage(data){
+   console.log(data);
+   this.openExpedientDetail.emit(data);
+ }
+
+ LoadList(){
+     this.processes.GetTasksList("Despacho", false).subscribe(result => {
+       console.log(result);
+       
+       this.despachoList = new Array();
+       let res = result.reverse();
+       res.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.despachoList.push(task);
+       });
+       console.log(this.despachoList);
+     });
+ }
+
+ doRefresh(event) {
+   this.LoadList();
+
+   setTimeout(() => {
+     event.target.complete();
+   }, 2000);
+ }
+
+ async viewExpedientDetail(serialNumber:any) {
+   console.log(this.profile);
+
+   let classs;
+   if( window.innerWidth <= 800){
+     classs = 'modal'
+   } else  {
+     classs = 'modal modal-desktop'
+   }
+
+   const modal = await this.modalController.create({
+     component: ExpedienteDetailPage,
+     componentProps:{
+       enterAnimation: "",
+       serialNumber: serialNumber,
+       profile: this.profile,
+     },
+     cssClass: classs,
+   });
+   await modal.present();
+   modal.onDidDismiss().then((res)=>{
+     console.log('refresh list');
+     this.LoadList();
+   });
+ }
+
+}
+ 
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 61159c3b3..09539eae4 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -8,11 +8,11 @@
     </div>
   </div>
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="parecer">
         Pedidos de Parecer
       </ion-segment-button>
-      <ion-segment-button value="deferimento" (click)="notImplemented()">
+      <ion-segment-button value="deferimento">
         Pedidos de Defereimento
       </ion-segment-button>
     </ion-segment>
@@ -28,41 +28,66 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'parecer'">
-      <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 class="width-100" [ngSwitch]="segment">
+    <div *ngIf="parecerList">
+      <ion-list *ngSwitchCase="'parecer'">
+        <ion-item 
+            class="expediente ion-no-padding"  
+            *ngFor = "let task of parecerList"
+            >
+            <!-- (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-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="exp-bottom-detail">
+                  <ion-label>{{ task.Folio }}</ion-label>
                 </div>
               </div>
-              <div class="exp-bottom-detail">
-                <ion-label>{{ task.Folio }}</ion-label>
+            </ion-item>
+      </ion-list>
+
+    </div>
+    <div *ngIf="deferimentoList">
+      <ion-list *ngSwitchCase="'deferimento'">
+        <ion-item 
+            class="expediente ion-no-padding"  
+            *ngFor = "let task of deferimentoList"
+            >
+            <!-- (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>
-            </div>
-          </ion-item>
-    </ion-list>
-    <ion-list *ngSwitchCase="'deferimento'">
-      <ion-item-group>
-        <ion-item-sliding>
-        </ion-item-sliding>
-      </ion-item-group>
-    </ion-list>
+            </ion-item>
+      </ion-list>
+    </div>
   </div>
-  <div *ngIf="!taskslist">
+  <div *ngIf="!parecerList && !deferimentoList">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index cbf52c39c..e624d0744 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -21,7 +21,7 @@
   }
 .item-list-small{
     font-size: 11px;
-    overflow: auto;
+    overflow: hidden;
   }
   .ion-item-class{
     padding: 0;
@@ -44,7 +44,7 @@ ion-item{
     margin: 0 auto;
     //padding: 10px;
     margin-bottom: 10px;
-    overflow: auto;
+    overflow: hidden;
   }
 .div-content-expediente{
   width: 100%;
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index a35d45180..52a0c313e 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -22,6 +22,9 @@ export class PedidosPage implements OnInit {
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
+  parecerList:DailyWorkTask[];
+  deferimentoList:DailyWorkTask[];
+  taskType: string;
   serialNumber:string;
 
   @Input() profile:string;
@@ -40,6 +43,9 @@ export class PedidosPage implements OnInit {
     //Inicializar segment
     this.LoadList();
   }
+  segmentChanged(ev: any) {
+    this.LoadList();
+  }
 
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -51,25 +57,53 @@ export class PedidosPage implements OnInit {
   }
 
   LoadList(){
-    this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
-      console.log(result);
-      
-      this.taskslist = new Array();
-      let res = result.reverse();
-      res.forEach(element => {
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "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);
+    if(this.segment == 'parecer'){
+      this.taskType = "Pedido de Parecer";
+      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+        console.log(result);
+        
+        this.parecerList = new Array();
+        let res = result.reverse();
+        res.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.parecerList.push(task);
+        });
+        console.log(this.parecerList);
+        
       });
-      console.log(this.taskslist);
-      
-    });
+    }
+    else if(this.segment == 'deferimento'){
+      this.taskType = "Pedido de Deferimento";
+      this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+        console.log(result);
+        
+        this.deferimentoList = new Array();
+        let res = result.reverse();
+        res.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.deferimentoList.push(task);
+        });
+        console.log(this.deferimentoList);
+        
+      });
+    }
+    console.log(this.taskType);
+    
+    
   }
 
   doRefresh(event) {