diff --git a/config.xml b/config.xml
index 721c9620c..09d2165cb 100644
--- a/config.xml
+++ b/config.xml
@@ -134,7 +134,7 @@
         </mfp:windows10>
         <mfp:appChecksum>0</mfp:appChecksum>
     </mfp:windows>
-    <mfp:platformVersion>8.0.0.00-20210308-063916</mfp:platformVersion>
+    <mfp:platformVersion>8.0.0.00-20210214-154410</mfp:platformVersion>
     <mfp:clientCustomInit enabled="false" />
     <mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" />
     <mfp:serverUri url="" />
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c9c6a9591..841a86ff0 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -66,10 +66,12 @@ export class HomePage implements OnInit {
   }
 
   ngOnInit() {
-    if(!this.platform.is('desktop')) {
+    if(this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      console.log('Notifications not supported')
+    } else {
       this.mobilefirstConnect();
       this.notificatinsservice.onReceviNotification();
-    } 
+    }
     this.count();
 
   }
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 40169c9a9..ac4074a02 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -5,7 +5,7 @@
         <ion-label class="title">{{modalTitle[taskType]}}</ion-label>
       </ion-item>
       <div class="ion-item-container width-100">
-        <ion-input placeholder="Assunto" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
+        <ion-input placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
       <div class="container-div width-100">
@@ -29,15 +29,15 @@
             </div>
             <div class="ion-input-class">
 
-              <ion-select class="d-block d-md-none" placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
+              <ion-select class="d-block d-md-none" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
                 <ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
 
-              <mat-form-field class="width-100 d-none d-md-block" placeholder="Sample Type" required>
-                <mat-select matInput [(value)]="postData.Priority" >
+              <mat-form-field class="width-100 d-none d-md-block" floatLabel="never" required>
+                <mat-select matInput [(ngModel)]="postData.Priority" >
                   <mat-option value="99999861">
                     Normal
                   </mat-option>
@@ -63,8 +63,8 @@
             </div>
             <div class="ion-input-class">
 
-              <mat-form-field appearance="fill" class="width-100">
-                <mat-select [formControl]="toppings">
+              <mat-form-field appearance="fill" class="width-100" floatLabel="never">
+                <mat-select placeholder="Prazo*" [formControl]="toppings">
                   <mat-option [value]="99999861">Normal</mat-option>
                   <mat-option  [value]="99999862">Urgente</mat-option>
                   <mat-option  [value]="99999863">Muito Urgente</mat-option>
@@ -85,7 +85,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss
index 8d65f1756..e2a954f25 100644
--- a/src/app/modals/create-process/create-process.page.scss
+++ b/src/app/modals/create-process/create-process.page.scss
@@ -72,7 +72,7 @@
     }
     .list-people-title{
       /* font-size: 13px; */
-      color: #797979;
+      color: #a3a3a3;
     }
     .attach-document{
       font-size: 15px;
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 2aed50f40..52fe388c5 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -54,7 +54,6 @@ export class CreateProcessPage implements OnInit {
 
   taskDate: Date;
   taskDescription: string;
-  user: string;
   loadedAttachments:any;
   subjectTypes:any;
   selectedTypes: string[]=[];
@@ -91,7 +90,6 @@ export class CreateProcessPage implements OnInit {
     private toastService: ToastService,
     ) {
       this.loggeduser = userAuth.ValidatedUser;
-      this.user = environment.defaultuser +'@'+ environment.domain;
       this.task = this.navParams.get('task');
 
       console.log('task', this.task)
@@ -180,6 +178,8 @@ export class CreateProcessPage implements OnInit {
     }
     
     let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
+    console.log(attendees);
+    
     attendees = attendees.map(function(val) {
       return {
         UserEmail: val.EmailAddress,
@@ -187,6 +187,8 @@ export class CreateProcessPage implements OnInit {
       };
     });
 
+    console.log(attendees);
+
     const DocumentToSave = this.documents.map((e) => {
       return {
         ApplicationId: e.ApplicationType,
@@ -204,7 +206,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
@@ -223,7 +225,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
@@ -243,7 +245,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
@@ -273,7 +275,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
@@ -292,7 +294,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
@@ -313,7 +315,7 @@ export class CreateProcessPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                 }
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index 2f2b46f6a..b4d74a350 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
-import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page';
-import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts
index 9ab745dfc..30edfac9e 100644
--- a/src/app/modals/forward/forward.page.ts
+++ b/src/app/modals/forward/forward.page.ts
@@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
-import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page';
-import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
@@ -16,6 +14,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
 import { ToastService } from 'src/app/services/toast.service';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
+import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
 
 @Component({
   selector: 'app-forward',
@@ -157,28 +156,44 @@ export class ForwardPage implements OnInit {
     }
   }
 
-  async addParticipants(){
-    console.log('HERE');
-    
+  async addParticipants() {
     this.adding = "intervenient";
-    if(window.innerWidth <= 800){
+    if(window.innerWidth <=800) {
+      this.showAttendees=false;
       const modal = await this.modalController.create({
-        component: AddParticipantsModalPage,
-         componentProps: {
-          eventPersons: this.eventAttendees
+        component: AttendeesPageModal,
+          componentProps: {
+          adding: this.adding,
+          taskParticipants: this.taskParticipants,
+          taskParticipantsCc: this.taskParticipantsCc
         },
-        cssClass: 'book-meeting-modal',
+        cssClass: 'modal attendee',
         backdropDismiss: false
       });
-  
+
       await modal.present();
-  
-      modal.onDidDismiss().then((res) => {
+
+      modal.onDidDismiss().then((data) => {
+        if(data) {
+          data = data['data'];
+          const newAttendees: EventPerson[] = data['taskParticipants'];
+          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+          this.setIntervenient(newAttendees);
+          this.setIntervenientCC(newAttendeesCC);
+        }
       });
     } else {
-      this.showAttendees = true;
+      this.showAttendees=true
     }
   }
+
+  async setIntervenient(data) {
+    this.taskParticipants = data;
+  }
+  
+  async setIntervenientCC(data) {
+    this.taskParticipantsCc = data;
+  }
   
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 7019f2e57..27ba6a432 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -17,7 +17,7 @@
   
         <div class="px-20">
           <div class="ion-item-container width-100">
-            <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
+            <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
           </div>
           <div class="container-div width-100">
             <div class="ion-item-class-2">
@@ -25,7 +25,7 @@
                 <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
+                <ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
               </div>
             </div>
           </div>
@@ -36,7 +36,7 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-select disabled  placeholder="Selecione agenda"
+                <ion-select disabled  placeholder="Selecione agenda*"
                 selectedText="{{postEvent.CalendarName}}" 
                 [(ngModel)]="postEvent.CalendarName" 
                 interface="action-sheet" Cancel-text="Cancelar" 
@@ -54,7 +54,7 @@
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-select  placeholder="Selecione tipo" 
+                <ion-select  placeholder="Selecione tipo de evento*" 
                 [(ngModel)]="postEvent.Categories[0]"
                 selectedText="{{postEvent.Categories[0]}}"
                 interface="action-sheet" 
@@ -116,7 +116,7 @@
                 <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-select placeholder="Selecione repetição" 
+                <ion-select placeholder="Selecione repetição*" 
                 [(ngModel)]="postEvent.IsRecurring"
                 selectedText="{{isRecurring}}" 
                 interface="action-sheet" 
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss
index de650114b..b11b9a1d5 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.scss
+++ b/src/app/pages/agenda/edit-event/edit-event.page.scss
@@ -87,7 +87,7 @@
       }
       .list-people-title{
         /* font-size: 13px; */
-        color: #797979;
+        color: #a3a3a3;
       }
       .attach-document{
         font-size: 15px;
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index d475fa8dd..980f320cf 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -15,7 +15,7 @@
     <!-- <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
     
     <div class="ion-item-container">
-      <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
+      <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
     <div class="container-div">
       <div class="ion-item-class-2">
@@ -23,7 +23,7 @@
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
         <div class="ion-input-class">
-          <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
+          <ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
       <!-- Error messages -->
@@ -39,7 +39,7 @@
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
         <div class="ion-input-class">
-          <ion-select  placeholder="Selecione agenda"
+          <ion-select  placeholder="Selecione agenda*"
           selectedText="{{postEvent.CalendarName}}" 
           [(ngModel)]="postEvent.CalendarName" 
           interface="action-sheet" Cancel-text="Cancelar" 
@@ -57,7 +57,7 @@
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
         <div class="ion-input-class">
-          <ion-select  placeholder="Selecione tipo" 
+          <ion-select  placeholder="Selecione tipo de evento*" 
           [(ngModel)]="postEvent.Categories[0]" 
           interface="action-sheet" 
           Cancel-text="Cancelar" required>
@@ -77,7 +77,7 @@
         </div>
         <div class="ion-input-class">
           <ion-datetime 
-            placeholder="Início"
+            placeholder="Início*"
             [(ngModel)]="postEvent.StartDate"
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,15,30,45"
@@ -98,7 +98,7 @@
         </div>
         <div class="ion-input-class">
           <ion-datetime 
-            placeholder="Fim"
+            placeholder="Fim*"
             [(ngModel)]="postEvent.EndDate"
             displayFormat="D MMM YYYY H:mm"
             minuteValues="0,15,30,45"
@@ -118,7 +118,7 @@
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
         </div>
         <div class="ion-input-class">
-          <ion-select placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
+          <ion-select placeholder="Selecione repetição*" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
             <ion-select-option value="false">Não se repete</ion-select-option>
             <ion-select-option value="true">Repete</ion-select-option>
           </ion-select>
@@ -135,7 +135,7 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-              <ion-label  *ngIf="taskParticipants?.length < 1"  class="list-people-title">Adicionar interveniente</ion-label>
+              <ion-label  *ngIf="taskParticipants?.length < 1"  class="list-people-title">Adicionar intervenientes*</ion-label>
                 <div class="list-people">
                     <ion-item lines="none">
                       <ion-list>
@@ -153,9 +153,7 @@
       </div>
     </div>
     
-
-    <!-- HIDDEN -->
-    <div hidden class="container-div">
+    <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss
index 1d201302a..3090c356e 100644
--- a/src/app/pages/agenda/new-event/new-event.page.scss
+++ b/src/app/pages/agenda/new-event/new-event.page.scss
@@ -104,7 +104,7 @@ ion-content{
       }
       .list-people-title{
         /* font-size: 13px; */
-        color: #797979;
+        color: #a3a3a3;
       }
       .attach-document{
         font-size: 15px;
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index b54ba055a..0b413e7c6 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -13,6 +13,7 @@ import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedi
 import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-view-event',
@@ -53,6 +54,7 @@ export class ViewEventPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private router: Router,
+    private toastService: ToastService,
   ) 
   {
     this.isEventEdited = false;
@@ -134,7 +136,7 @@ export class ViewEventPage implements OnInit {
         setTimeout(()=>{
           alert.dismiss();
         }, 1500);
-        
+        this.toastService.successMessage('Evento apagado');
         this.close();
       });  
   }
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 95791e630..9f2d50d46 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -141,7 +141,7 @@ export class EventsPage implements OnInit {
         this.showLoader = false;
        
     }
-    else{
+    else if (this.loggeduser.Profile == 'PR'){
 
       let prOficialEvents=  await this.eventService.getAllPrOficialEvents(start, end).toPromise();
       let prPessoalEvents=  await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 82c65d7d6..e43640af9 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -30,6 +30,7 @@ constructor(
   private activatedRoute: ActivatedRoute,
   ) {
     this.activatedRoute.queryParams.subscribe(params => {
+      console.log('Cria');
 
       if(params['segment'] == 'validar') {
         this.segment = 'validar';
@@ -42,12 +43,15 @@ constructor(
   }
 
   ngOnInit() {
-    this.LoadList();
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
+        console.log('Atualiza');
+        
         this.LoadList();
       }
     });
+    console.log('Init');
+    this.LoadList();
   }
   
   segmentChanged(ev: any) {
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts
deleted file mode 100644
index 41b207888..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AddParticipantsCcModalPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AddParticipantsCcModalPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts
deleted file mode 100644
index bc0249591..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { AddParticipantsCcModalPageRoutingModule } from './add-participants-cc-modal-routing.module';
-
-import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    AddParticipantsCcModalPageRoutingModule
-  ],
-  declarations: [AddParticipantsCcModalPage]
-})
-export class AddParticipantsCcModalPageModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html
deleted file mode 100644
index b4bed4fb0..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<ion-header class="ion-no-border">
-  <h4>Com conhecimento</h4>
-  <ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar>
-  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-</ion-header>
-
-<ion-content>
-  <ion-item-group>
-    <ion-list>
-      <ion-item-sliding>
-        <ion-item *ngFor="let attendee of contacts">
-          <ion-checkbox slot="end" (ionChange)="selectContact(attendee)"></ion-checkbox>
-          <ion-label>
-            <h3>{{ attendee.Name }}</h3>
-            <p>{{ attendee.EmailAddress }}</p>
-          </ion-label>
-        </ion-item>
-      </ion-item-sliding>
-    </ion-list>
-  </ion-item-group>
-
-</ion-content>
-<ion-footer>
-  <ion-toolbar>
-    <ion-item lines="none">
-      <p>
-        <ion-button class="button-cancel" shape="round" (click)="cancelTask()">Cancelar</ion-button>
-      </p>
-      <p>
-        <ion-button class="button-save" shape="round" (click)="saveTask()">Gravar</ion-button>
-      </p>
-    </ion-item>
-  </ion-toolbar>
-</ion-footer>
-
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss
deleted file mode 100644
index 5e0ed3224..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-ion-header{
-    padding: 20px 20px 0px 20px;
-}
-ion-content{
-    --padding-top: 20px;
-    --padding-start: 15px;
-    --padding-end: 20px;
-}
-
-.container-footer{
-    margin:0 auto;
-    overflow: auto;
-}
-.button-cancel {
-    width: 170px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #e0e9ee;
-    --color: #061b52;
-    margin:10px;
-  }
-  .button-save {
-    width: 170px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #42b9fe;
-    --color:#ffffff;
-    margin:10px;
-  }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts
deleted file mode 100644
index 23481cfde..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page';
-
-describe('AddParticipantsCcModalPage', () => {
-  let component: AddParticipantsCcModalPage;
-  let fixture: ComponentFixture<AddParticipantsCcModalPage>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AddParticipantsCcModalPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(AddParticipantsCcModalPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts
deleted file mode 100644
index 07e6b8d65..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
-import { EventPerson } from 'src/app/models/eventperson.model';
-import { ContactsService } from 'src/app/services/contacts.service';
-
-@Component({
-  selector: 'app-add-participants-cc-modal',
-  templateUrl: './add-participants-cc-modal.page.html',
-  styleUrls: ['./add-participants-cc-modal.page.scss'],
-})
-export class AddParticipantsCcModalPage implements OnInit {
-  
-  contacts: EventPerson[];
-  showLoader: boolean = false;
-  eventPersons: EventPerson[];
-  participantsAdded: any;
-
-  constructor(private modalController: ModalController, 
-    private contactsService: ContactsService,
-    private navParams: NavParams,
-    ) { 
-      this.participantsAdded = this.navParams.get('eventPersons');
-    }
-
-  ngOnInit() {
-    this.fetchContacts("");
-  }
-
-  onChange(evt: any) {
-    this.fetchContacts(evt.detail.value);
-  }
-
-  selectContact(itm: EventPerson){
-    itm.IsRequired = !itm.IsRequired;
-  }
-  
-  async fetchContacts(filter: string) {
-    this.showLoader = true;
-
-    this.contactsService.getContacts(filter).subscribe(result =>
-      {
-        if (this.participantsAdded != null)
-        {
-          this.participantsAdded.forEach(attendee => {
-            const index: number = result.findIndex((cont) => {
-              return cont.EmailAddress == attendee.UserId
-            });
-  
-            result.splice(index, 1);
-          });
-        }
-        this.contacts = result;  
-        this.showLoader = false;
-      }
-    );
-  }
-
-  cancelTask(){
-    this.modalController.dismiss(null);
-  }
-
-  saveTask(){
-    this.modalController.dismiss(this.contacts.filter(function(contact) {
-      if(contact.IsRequired){
-        /* console.log(contact); */
-      }
-      
-      return contact.IsRequired == true;
-    }));
-  }
-
-}
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts
deleted file mode 100644
index f6e6c6ca7..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AddParticipantsModalPage } from './add-participants-modal.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AddParticipantsModalPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AddParticipantsModalPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts
deleted file mode 100644
index 7ba6edc49..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { AddParticipantsModalPageRoutingModule } from './add-participants-modal-routing.module';
-
-import { AddParticipantsModalPage } from './add-participants-modal.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    AddParticipantsModalPageRoutingModule
-  ],
-  declarations: [AddParticipantsModalPage]
-})
-export class AddParticipantsModalPageModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html
deleted file mode 100644
index f654a2caa..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<ion-header class="ion-no-border">
-  <h4>Adicionar Intervenientes - TK</h4>
-  <ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar>
-  <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-</ion-header>
-
-<ion-content>
-  <ion-item-group>
-    <ion-list>
-      <ion-item-sliding>
-        <ion-item *ngFor="let attendee of contacts">
-          <ion-checkbox slot="end" (ionChange)="selectContact(attendee)"></ion-checkbox>
-          <!-- <div *ngFor="let part of participantsAdded"> -->
-            <ion-label>
-              <h3>{{ attendee.Name }}</h3>
-              <p>{{ attendee.EmailAddress }}</p>
-            </ion-label>
-         <!--  </div> -->
-        </ion-item>
-      </ion-item-sliding>
-    </ion-list>
-  </ion-item-group>
-
-</ion-content>
-<ion-footer>
-  <ion-toolbar>
-    <ion-item lines="none">
-      <p>
-        <ion-button class="button-cancel" shape="round" (click)="cancelTask()">Cancelar</ion-button>
-      </p>
-      <p>
-        <ion-button class="button-save" shape="round" (click)="saveTask()">Gravar</ion-button>
-      </p>
-    </ion-item>
-  </ion-toolbar>
-</ion-footer>
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss
deleted file mode 100644
index 5e0ed3224..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-ion-header{
-    padding: 20px 20px 0px 20px;
-}
-ion-content{
-    --padding-top: 20px;
-    --padding-start: 15px;
-    --padding-end: 20px;
-}
-
-.container-footer{
-    margin:0 auto;
-    overflow: auto;
-}
-.button-cancel {
-    width: 170px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #e0e9ee;
-    --color: #061b52;
-    margin:10px;
-  }
-  .button-save {
-    width: 170px;
-    height: 44px;
-    border-radius: 22.5px;
-    --background: #42b9fe;
-    --color:#ffffff;
-    margin:10px;
-  }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts
deleted file mode 100644
index 33f7c7d91..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { AddParticipantsModalPage } from './add-participants-modal.page';
-
-describe('AddParticipantsModalPage', () => {
-  let component: AddParticipantsModalPage;
-  let fixture: ComponentFixture<AddParticipantsModalPage>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AddParticipantsModalPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(AddParticipantsModalPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts
deleted file mode 100644
index 818795e56..000000000
--- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
-import { EventPerson } from 'src/app/models/eventperson.model';
-import { ContactsService } from 'src/app/services/contacts.service';
-
-@Component({
-  selector: 'app-add-participants-modal',
-  templateUrl: './add-participants-modal.page.html',
-  styleUrls: ['./add-participants-modal.page.scss'],
-})
-export class AddParticipantsModalPage implements OnInit {
-  
-  contacts: EventPerson[];
-  showLoader: boolean = false;
-  eventPersons: EventPerson[];
-  participantsAdded: any;
-
-  constructor(private modalController: ModalController, 
-    private contactsService: ContactsService,
-    private navParams: NavParams,) { }
-
-  ngOnInit() {
-    this.fetchContacts("");
-    this.participantsAdded = this.navParams.get('eventPersons');
-  }
-  async fetchContacts(filter: string) {
-    this.showLoader = true;
-
-    this.contactsService.getContacts(filter).subscribe(result =>
-      {
-        if (this.participantsAdded != null)
-        {
-          this.participantsAdded.forEach(attendee => {
-            const index: number = result.findIndex((cont) => {
-              return cont.EmailAddress == attendee.UserId
-            });
-  
-            result.splice(index, 1);
-          });
-        }
-        this.contacts = result;
-        this.showLoader = false;
-      }
-    );
-  }
-
-  onChange(evt: any) {
-    this.fetchContacts(evt.detail.value);
-  }
-
-  selectContact(itm: EventPerson){
-    itm.IsRequired = !itm.IsRequired;
-  }
-
-  cancelTask(){
-    this.modalController.dismiss(null);
-  }
-
-  saveTask(){
-    this.modalController.dismiss(this.contacts.filter(function(contact) {
-      if(contact.IsRequired){
-        /* console.log(contact); */
-      }
-      
-      return contact.IsRequired == true;
-    }));
-  }
-
-}
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 66633a13e..4af7eba49 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -10,7 +10,7 @@
       <div class="overflow-y-auto content-default-padding">
         
         <div class="ion-item-container width-100">
-          <ion-input placeholder="Assunto" [(ngModel)]="postData.Subject"></ion-input>
+          <ion-input placeholder="Assunto*" [(ngModel)]="postData.Subject"></ion-input>
         </div>
 
         <div class="container-div width-100">
@@ -19,7 +19,7 @@
               <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
             </div>
             <div class="ion-input-class">
-              <ion-input placeholder="Localização" [(ngModel)]="postData.Location"></ion-input>
+              <ion-input placeholder="Localização*" [(ngModel)]="postData.Location"></ion-input>
             </div>
           </div>
           <!-- Error messages -->
@@ -46,8 +46,8 @@
               </ion-select>
 
 
-              <mat-form-field  class="d-none d-md-block width-100" placeholder="Selecione agenda">
-                <mat-select [(value)]="postData.CalendarName" >
+              <mat-form-field  class="d-none d-md-block width-100">
+                <mat-select placeholder="Selecione agenda" [(ngModel)]="postData.CalendarName" >
                   <mat-option value="Oficial">
                     Oficial
                   </mat-option>
@@ -69,7 +69,7 @@
           <div class="ion-input-class">
             <ion-datetime 
               class="d-block d-md-none"
-              placeholder="Início"
+              placeholder="Início*"
               [(ngModel)]="postData.StartDate" 
               displayFormat="D MMM YYYY H:mm"
               minuteValues="0,15,30,45"
@@ -81,7 +81,7 @@
            
             <mat-form-field class="width-100 date-hour-picker d-none d-md-block">
               <input matInput [ngxMatDatetimePicker]="picker1" 
-                placeholder="Choose a date" 
+                placeholder="Choose a date*" 
                 [formControl]="dateControlStart"
                 [min]="minDate" [max]="maxDate" 
                 [disabled]="disabled"
@@ -108,7 +108,7 @@
             <div class="ion-input-class">
               <ion-datetime 
                 class="d-block d-md-none"
-                placeholder="Fim"
+                placeholder="Fim*"
                 [(ngModel)]="postData.EndDate" 
                 displayFormat="D MMM YYYY H:mm"
                 minuteValues="0,15,30,45"
@@ -120,7 +120,7 @@
               
               <mat-form-field class="date-hour-picker">
                 <input matInput [ngxMatDatetimePicker]="fim" 
-                  placeholder="Choose a date" 
+                  placeholder="Choose a date*S" 
                   [formControl]="dateControlEnd"
                   [min]="minDate" [max]="maxDate" 
                   [disabled]="disabled"
@@ -147,7 +147,7 @@
               <ion-select 
                 class="d-block d-md-none"
                 [(ngModel)]="postData.IsRecurring" 
-                placeholder="Selecione repetição" 
+                placeholder="Selecione repetição*" 
                 value="false" 
                 interface="action-sheet" 
                 Cancel-text="Cancelar" 
@@ -162,14 +162,14 @@
               </ion-select>
 
 
-              <mat-form-field  
-                class="width-100 d-none d-md-block"
-                placeholder="Selecione repetição" 
+              <mat-form-field
+                floatLabel="never"
+                class="width-100 d-none d-md-block" 
                 value="false" 
                 interface="action-sheet" 
                 required
               >
-                <mat-select [(value)]="postData.IsRecurring">
+                <mat-select placeholder="Selecione repetição*" [(ngModel)]="postData.IsRecurring" >
                   <mat-option value="false">
                     Não se repete
                   </mat-option>
@@ -192,7 +192,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
@@ -288,7 +288,7 @@
 </ion-content>
 <ion-footer>
   <div class="buttons">
-    <button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
+    <button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
     <button class="btn-ok" shape="round" (click)="saveTask()">Gravar</button>
   </div>
 </ion-footer>
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
index 32c453fd4..7a4a2d624 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
@@ -70,7 +70,7 @@
   }
   .list-people-title{
     /* font-size: 13px; */
-    color: #797979;
+    color: #a3a3a3;
   }
   .attach-document{
     font-size: 15px;
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 88653e0aa..6296cd6b7 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
@@ -129,8 +129,6 @@ export class BookMeetingModalPage implements OnInit {
   ngOnInit() {
     this.adding = "intervenient";
     console.log(this.task);
-    
-
     this.getAttachments();
   }
 
@@ -141,12 +139,9 @@ export class BookMeetingModalPage implements OnInit {
   }
 
   close(){
-    this.router.navigate(['/home/gabinete-digital/expediente']);
-    this.modalController.dismiss(null);
-  }
-  cancelTask(){
     this.modalController.dismiss(null);
   }
+  
   goBack() {
     this.modalController.dismiss(null);
     let navigationExtras: NavigationExtras = {
@@ -161,8 +156,6 @@ export class BookMeetingModalPage implements OnInit {
     }
   }
   async saveTask(){
-    console.log('HERE');
-    
     // issue12323423
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
@@ -235,10 +228,7 @@ export class BookMeetingModalPage implements OnInit {
       } catch (error) {
         this.toastService.badRequest()
       }
-     
     }
-
-   
   }
 
   async addParticipants(){
@@ -323,7 +313,6 @@ export class BookMeetingModalPage implements OnInit {
     });
 
     await modal.present();
-
     modal.onDidDismiss();
   }
 
@@ -348,11 +337,8 @@ export class BookMeetingModalPage implements OnInit {
   }
 
   removeAttachment(index: number){
-
     this.documents = this.documents.filter( (e, i) =>  index != i);
-
   }
-
   
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();
@@ -366,12 +352,10 @@ export class BookMeetingModalPage implements OnInit {
     this.taskParticipantsCc = taskParticipantsCc;
   }
 
-
   goToGabinete() {
     this.router.navigate(['/home/gabinete-digital']);
   }
 
-
   setIntervenient(data){
     this.taskParticipants = data;
   }
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 6bea75699..7983b307f 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -5,7 +5,7 @@
         <ion-label class="title">{{modalTitle[taskType]}}</ion-label>
       </ion-item>
       <div class="ion-item-container width-100">
-        <ion-input placeholder="Assunto" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
+        <ion-input placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
       <!-- Add scrolls -->
@@ -29,7 +29,7 @@
             </div>
             <div class="ion-input-class">
               <ion-select 
-                placeholder="Prazo" 
+                placeholder="Prazo*" 
                 [(ngModel)]="postData.Priority" 
                 interface="action-sheet" 
                 Cancel-text="Cancelar" 
@@ -43,7 +43,7 @@
               </ion-select>
 
               <mat-form-field appearance="fill" class="width-100 d-none d-md-block">
-                <mat-select [(value)]="postData.Priority">
+                <mat-select placeholder="Prazo*" [(ngModel)]="postData.Priority">
                   <mat-option [value]="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</mat-option>
                   <mat-option  [value]="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</mat-option>
                   <mat-option  [value]="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</mat-option>
@@ -70,10 +70,11 @@
                 </ion-select>
               </ion-item>
               
-              <mat-form-field 
+              <mat-form-field
+                floatLabel="never"
                 appearance="fill" 
                 class="width-100 d-none d-md-block">
-                <mat-select [formControl]="toppings" multiple>
+                <mat-select [formControl]="toppings" multiple placeholder="Selecione o tipo de evento*">
                   <mat-option *ngFor="let type of subjectTypes" [value]="type.Code">{{type.Description}}</mat-option>
                 </mat-select>
               </mat-form-field>
@@ -90,7 +91,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index 79005ca36..9dc2f577d 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -73,7 +73,7 @@
   }
   .list-people-title{
     /* font-size: 13px; */
-    color: #797979;
+    color: #a3a3a3;
   }
   .attach-document{
     font-size: 15px;
@@ -128,8 +128,6 @@
   }
 }
 
-
-
 .attach-icon{
   width: 37px;
   font-size: 35px;
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 04b74559d..aaa148321 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -60,7 +60,6 @@ export class ExpedientTaskModalPage implements OnInit {
 
   taskDate: Date;
   taskDescription: string;
-  user: string;
   
   loadedAttachments:any;
   documents:SearchDocument[] = [];
@@ -105,7 +104,6 @@ export class ExpedientTaskModalPage implements OnInit {
     ) {
 
       this.loggeduser = userAuth.ValidatedUser;
-      this.user = environment.defaultuser +'@'+ environment.domain;
       this.task = this.navParams.get('task');
 
       console.log('task', this.task)
@@ -230,7 +228,7 @@ export class ExpedientTaskModalPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                   AttachmentList: docs,
@@ -261,7 +259,7 @@ export class ExpedientTaskModalPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority,
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                   AttachmentList: docs
@@ -289,7 +287,7 @@ export class ExpedientTaskModalPage implements OnInit {
                   DistributionType: "Paralelo",
                   CountryCode: 'AO',
                   Priority: this.postData.Priority, 
-                  UserEmail: this.user,
+                  UserEmail: this.loggeduser.Email,
                   UsersSelected: attendees,
                   DispatchFolder: this.dispatchFolder,
                   AttachmentList: docs
@@ -325,7 +323,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
                 Priority: this.postData.Priority,
-                UserEmail: this.user,
+                UserEmail: this.loggeduser.Email,
                 UsersSelected: attendees,
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs,
@@ -356,7 +354,7 @@ export class ExpedientTaskModalPage implements OnInit {
                 DistributionType: "Paralelo",
                 CountryCode: 'AO',
                 Priority: this.postData.Priority,
-                UserEmail: this.user,
+                UserEmail: this.loggeduser.Email,
                 UsersSelected: attendees,
                 DispatchFolder: this.dispatchFolder,
                 AttachmentList: docs
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts
index 9ff908043..7bc75d498 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts
@@ -1,38 +1,31 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ExpedientePage } from './expediente.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ExpedientePage
-  },
-  {
-    path: 'expediente-detail',
-    loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule)
-  },
-  {
-    path: 'expedient-task-modal',
-    loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule)
-  },
  {
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ExpedientePage } from './expediente.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ExpedientePage
+  },
+  {
+    path: 'expediente-detail',
+    loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule)
+  },
+  {
+    path: 'expedient-task-modal',
+    loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule)
+  },
+  {
     path: 'book-meeting-modal',
     loadChildren: () => import('./book-meeting-modal/book-meeting-modal.module').then( m => m.BookMeetingModalPageModule)
   },
-  {
-    path: 'add-participants-modal',
-    loadChildren: () => import('./add-participants-modal/add-participants-modal.module').then( m => m.AddParticipantsModalPageModule)
-  },
-  {
-    path: 'add-participants-cc-modal',
-    loadChildren: () => import('./add-participants-cc-modal/add-participants-cc-modal.module').then( m => m.AddParticipantsCcModalPageModule)
-  }
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ExpedientePageRoutingModule {}
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ExpedientePageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 195067a0a..c5f79c42b 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -125,7 +125,7 @@
       </div>
     </div>
 
-    <div *ngIf="!task">
+    <div class="width-100" *ngIf="!task">
       <ion-list>
         <ion-list-header>
           <ion-label>
@@ -160,10 +160,6 @@
             </p>
           </ion-label>
         </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
       </ion-list>
     </div>
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 346097d46..34a7e03a5 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -86,7 +86,7 @@
               <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
             </div>
             <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p> 
-            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despacho criados por mim</p> 
+            <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p> 
             <p class="text-center exp-card-content">{{ count_de_pr }} <span class="title1">Documentos</span> </p>
           </div>
 
@@ -150,15 +150,14 @@
         <app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
         <app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
         
-        <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 (openPedido)="openExpedientPage($event)" [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" 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>
-        <app-despachos-pr (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachosPr"></app-despachos-pr>
-        <app-pendentes (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showPendentes"></app-pendentes>
+        <app-expedients [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
+        <app-pedidos [profile]="profile" [segment]="segment" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
+        <app-despachos  [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachos"></app-despachos>
+        <app-despachos-pr [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachosPr"></app-despachos-pr>
+        <app-pendentes  [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showPendentes"></app-pendentes>
         <app-diplomas (openExpedientDetail)="openExpedientesPrPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showDiplomas"></app-diplomas>
         <app-diplomas-assinar class="d-flex height-100 flex-column" *ngIf="showDiplomasAssinar"></app-diplomas-assinar>
-        <app-expedientes-pr (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedientesPr"></app-expedientes-pr>
+        <app-expedientes-pr [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedientesPr"></app-expedientes-pr>
         <app-signed-diploma  [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showSignedDiploma"></app-signed-diploma>
       </div>
   </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 6545b3340..9d6c83605 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -333,26 +333,6 @@ export class GabineteDigitalPage implements OnInit {
       //this.eventsToApprove.doRefresh();
     }
   }
-  
-  async openEventsToApproveList(profile:any) {
-    
-    this.closeAllDesktopComponent();
-    //if( window.innerWidth <= 1024){
-      const modal = await this.modalController.create({
-        component: EventListPage,
-        componentProps:{
-          profile: profile,
-        },
-        cssClass: 'modal modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss();
-    //} else {
-      //this.desktopComponent.showEventList = true;
-    //}
-
-  }
 
   openExpedientListPage() {
     this.closeAllDesktopComponents();
@@ -385,23 +365,9 @@ export class GabineteDigitalPage implements OnInit {
     
   }
 
-  openExpedientPage(data){
-    console.log(data);
-    
-    this.closeAllDesktopComponents();
-    if( window.innerWidth <= 800){
-      //this.openExpedientList();
-    }
-    else{
-      this.serialNumber = data;
-      this.showExpedientDetail = true;
-    }
-  }
-
   openPedidosPage(segment:string) {
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 800) {
-      //this.openPedidoList();
 
       let navigationExtras: NavigationExtras;
 
@@ -424,7 +390,6 @@ export class GabineteDigitalPage implements OnInit {
   openDespachosPage(segment?:string) {
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 800){
-      //this.openDespachoList();
       this.router.navigate(['/home/gabinete-digital/despachos']);
     }
     else{
@@ -437,7 +402,6 @@ export class GabineteDigitalPage implements OnInit {
   openDespachosPrPage(segment?:string) {
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 800){
-      //this.openDespachoListPr();
       this.router.navigate(['/home/gabinete-digital/despachos-pr']);
     }
     else{
@@ -450,7 +414,6 @@ export class GabineteDigitalPage implements OnInit {
   openPendentesPage(segment?:string){
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 800){
-      //this.openPendenteList();
       this.router.navigate(['/home/gabinete-digital/pendentes']);
     }
     else{
@@ -463,7 +426,6 @@ export class GabineteDigitalPage implements OnInit {
   openExpedientesPrPage(segment?:string){
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 800) {
-      //this.openExpedientList();
       this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
     }
     else {
@@ -479,7 +441,6 @@ export class GabineteDigitalPage implements OnInit {
     this.closeAllDesktopComponents();
     
     if( window.innerWidth <= 800){
-      //this.openDeploma();
       let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
       this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
     }
@@ -496,7 +457,6 @@ export class GabineteDigitalPage implements OnInit {
 
     if (this.loggeduser.Profile == 'MDGPR') {
       if( window.innerWidth <= 800){
-        //this.openDeploma();
         let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
         this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
       }
@@ -507,7 +467,6 @@ export class GabineteDigitalPage implements OnInit {
       }
     } else {
       if( window.innerWidth <= 800){
-        //this.openDeploma();
         let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras);
       }
@@ -517,109 +476,6 @@ export class GabineteDigitalPage implements OnInit {
         this.showDiplomasAssinar = true;
       }
     }
-
-
-  }
-
-  openSignedDiploma(segment:string) {
-    this.closeAllDesktopComponents();
-    if( window.innerWidth <= 800){
-      this.openDeploma();
-    }
-    else{
-      this.segment = segment;
-      this.showSignedDiploma = true;
-    }
-  }
-
-  async openDeploma() {
-    const modal = await this.modalController.create({
-      component: DiplomasPage,
-      componentProps:{
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-      //backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss();
-  }
-
-  async openExpedientList(){
-    this.closeAllDesktopComponent();
-    //if( window.innerWidth <= 1024){
-      const modal = await this.modalController.create({
-        component: ExpedientePage,
-        componentProps: {
-          profile: this.profile,
-        },
-        cssClass: 'modal modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss();
-    //} else {
-      console.log('show desktop modal')
-      //this.desktopComponent.showExpediente = true;
-    //}
-  }
-
-  /* async openPendenteList(){
-    this.closeAllDesktopComponent();
-      const modal = await this.modalController.create({
-        component: PendentesPage,
-        componentProps:{
-          profile: this.profile,
-        },
-        cssClass: 'modal modal-desktop',
-      });
-      await modal.present();
-      modal.onDidDismiss();
-      console.log('show desktop modal')
-  } */
-
-  async openDespachoList(){
-    this.closeAllDesktopComponent();
-      const modal = await this.modalController.create({
-        component: DespachosPage,
-        componentProps:{
-          profile: this.profile,
-          serialNumber: this.serialNumber
-        },
-        cssClass: 'modal modal-desktop',
-      });
-      await modal.present();
-      modal.onDidDismiss();
-      console.log('show desktop modal')
-  }
-
-  async openDespachoListPr(){
-
-    this.closeAllDesktopComponent();
-    const modal = await this.modalController.create({
-      component: DespachosPrPage,
-      componentProps:{
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss();
-    console.log('show desktop modal')
-  }
-
-  async openPedidoList(){
-    this.closeAllDesktopComponent();
-      const modal = await this.modalController.create({
-        component: PedidosPage,
-        componentProps:{
-          profile: this.profile,
-        },
-        cssClass: 'modal modal-desktop',
-      });
-      await modal.present();
-      modal.onDidDismiss();
-      console.log('show desktop modal')
   }
 
 }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 922b85145..7fd25e3ea 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -41,7 +41,8 @@ export class AuthService {
     
 
     async login(user: UserForm): Promise<boolean> {
-      user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
+      //user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password);
+      user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + user.password); //conversão em base64 das credenciais inseridas
 
 
       const options = { headers: {'Authorization': user.BasicAuthKey }};
@@ -55,12 +56,11 @@ export class AuthService {
       let response: any;
 
       try {
-        result = await this.http.get<boolean>(service, options).toPromise();
         response = await this.http.post<User>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
 
         console.log(response);
 
-        if (result) {
+        if (response) {
           if( response.RoleID == 100000014) {
             response.Profile = 'PR'
           } else if(response.RoleID == 100000011) {
@@ -73,11 +73,11 @@ export class AuthService {
 
           this.storageService.store(AuthConnstants.USER, response);
 
-          return result;
+          return true;
         }
         
       } catch (error) {
-        return result;
+        return false;
       }
       
     }
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 52cc00153..c5c4d8f96 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -118,15 +118,6 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-
-    /* switch (this.loggeduser.Profile == 'MDGPR') {
-      case value:
-        
-        break;
-    
-      default:
-        break;
-    } */
     
     let options = { 
       headers: this.headersPrOficial, 
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 0846829e1..bf7396d88 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -35,7 +35,7 @@ export class NotificationsService {
   }
 
   getAndpostToken(username) {
-    if (this.platform.is('desktop')) {
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       console.log('Notifications not supported')
     } else {
 
@@ -133,6 +133,13 @@ export class NotificationsService {
     }
     else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital']));
+    }else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          "serialNumber": data.IdObject,
+          }
+        };
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras));
     }
     else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
       let navigationExtras: NavigationExtras = {
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 4a54fbd32..0d792ce3e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -14,7 +14,7 @@
 <ion-content>
   <div class="main-content">
     <div class="ion-item-container">
-      <ion-input  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
+      <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
     <div class="container-div">
       <div class="ion-item-class-2 width-100 d-flex">
@@ -22,7 +22,7 @@
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
+          <ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
       <!-- Error messages -->
@@ -41,7 +41,7 @@
         <div class="ion-input-class flex-grow-1">
 
           <mat-form-field floatLabel="never" class="width-100" >
-            <mat-select placeholder="Selecione agenda" [(ngModel)]="postEvent.CalendarName" >
+            <mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
               <mat-option value="Oficial">
                 Oficial
               </mat-option>
@@ -62,9 +62,9 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field class="width-100" placeholder="Sample Type" required>
+          <mat-form-field floatLabel="never" class="width-100" required>
             <!-- <input matInput type="text" > -->
-            <mat-select matInput [(value)]="postEvent.Categories[0]" >
+            <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories[0]" >
               <mat-option value="Reunião">
                 Reunião
               </mat-option>
@@ -91,7 +91,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date" 
               [formControl]="dateControlStart"
@@ -119,7 +119,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field class="date-hour-picker">
+          <mat-form-field floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim" 
               placeholder="Choose a date" 
               [formControl]="dateControlEnd"
@@ -147,8 +147,8 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field  class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
-            <mat-select [(ngModel)]="postEvent.IsRecurring">
+          <mat-form-field floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
+            <mat-select placeholder="Selecione repetição*" [(ngModel)]="postEvent.IsRecurring">
               <mat-option value="false">
                 Não se repete
               </mat-option>
@@ -194,7 +194,7 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Como conhecido</ion-label>
+                <ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
                 <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
               </ion-list>
             </ion-item>
@@ -255,15 +255,15 @@
 <ion-footer class="ion-no-border">
   <ion-toolbar class="width-100 d-flex justify-space-between px-20">
     <ion-buttons slot="start">
-      <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
+      <button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>
-      </ion-button>
+      </button>
     </ion-buttons>
     <ion-title></ion-title>
     <ion-buttons slot="end">
-      <ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
+      <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
         <ion-label>Gravar</ion-label>
-      </ion-button>
+      </button>
     </ion-buttons>
   </ion-toolbar>
 </ion-footer>
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss
index f9eea71be..285021125 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.scss
+++ b/src/app/shared/agenda/edit-event/edit-event.page.scss
@@ -99,7 +99,7 @@ ion-content{
       }
       .list-people-title{
         /* font-size: 13px; */
-        color: #797979;
+        color: #a3a3a3;
       }
       .attach-document{
         font-size: 15px;
diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss
index 106a2a60f..f7dbbd685 100644
--- a/src/app/shared/agenda/new-event/new-event.page.scss
+++ b/src/app/shared/agenda/new-event/new-event.page.scss
@@ -91,7 +91,6 @@
       .list-people{
         width: 256px;
         float: left;
-        color: #ebebeb;
       
       }
       .add-people{
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index ae118dc79..dee369484 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -53,7 +53,7 @@ export class ViewEventPage implements OnInit {
     private processes: ProcessesService,
     private modalController: ModalController,
     public popoverController: PopoverController,
-    private toastService: ToastService
+    private toastService: ToastService,
   ) 
   {
     this.isEventEdited = false;
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index b1e04b630..a3a2551a3 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -16,7 +16,7 @@
       <ion-item-sliding class="overflow-y-auto">
         <div class="px-20">
           <div class="ion-item-container width-100">
-            <ion-input  placeholder="Assunto" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
+            <ion-input  placeholder="Assunto*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Subject"></ion-input>
           </div>
           <div class="container-div width-100">
             <div class="ion-item-class-2">
@@ -24,7 +24,7 @@
                 <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
               </div>
               <div class="ion-input-class">
-                <ion-input placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
+                <ion-input placeholder="Localização*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
               </div>
             </div>
             <!-- Error messages -->
@@ -41,7 +41,7 @@
               </div>
               <div class="ion-input-class">
                 
-                <ion-select disabled  placeholder="Selecione agenda"
+                <ion-select disabled  placeholder="Selecione agenda*"
                   class="d-block d-md-none"
                   selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}" 
                   [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" 
@@ -53,8 +53,8 @@
                 </ion-select>
 
 
-                <mat-form-field  class="d-none d-md-block width-100" placeholder="Selecione agenda">
-                  <mat-select [(value)]="eventProcess.workflowInstanceDataFields.Agenda" >
+                <mat-form-field  class="d-none d-md-block width-100" >
+                  <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
                     <mat-option value="Oficial">
                       Oficial
                     </mat-option>
@@ -194,7 +194,7 @@
                 <div class="list-people flex-grow-1">
                   <ion-item lines="none">
                     <ion-list>
-                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
+                      <ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
                       <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                     </ion-list>
                   </ion-item>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index d410ad4a4..b2d2f646f 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -18,7 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index e906e3145..9c530c8fe 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
+    <div *ngIf="parecerList" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
       </ion-list>
 
     </div>
-    <div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
+    <div *ngIf="deferimentoList" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'deferimento'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b01cd1341..2b6b37e91 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -8,9 +8,9 @@ export const environment = {
   /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', */
   apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
-  domain: 'gabinetedigital.local',
-  defaultuser: 'paulo.pinto',
-  defaultuserpwd: 'tabteste@006'
+  domain: 'gabinetedigital.local', //gabinetedigital.local
+  defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
+  defaultuserpwd: 'tabteste@006' //tabteste@006
 };
 
 /*