Fix conflit

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -127,10 +127,9 @@ export class ApproveEventPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
       this.router.navigate(['/home/gabinete-digital/event-list']);
-      this.modalController.dismiss(null);
       this.toastService.successMessage('Evento rejeitado')
     } catch (error) {
-      this.toastService.badRequest('Evento não rejeitado')
+      this.toastService.badRequest('Processo não efectuado')
     }
 
   }

src/app/shared/agenda/new-event/new-event.page.html

@@ -13,22 +13,20 @@
 <ion-content>
   <div class="main-content">
 
+    <!-- <form class="form-inline">
+      <div class="form-group">
+        <div class="input-group">
+          <input class="form-control" placeholder="yyyy-mm-dd"
+                name="dp"  ngbDatepicker #d="ngbDatepicker">
+          <div class="input-group-append">
+            <button class="btn btn-outline-secondary calendar" (click)="d.toggle()" type="button"></button>
+          </div>
+        </div>
+      </div>
+    </form> -->
 
-    <!-- <mat-form-field appearance="fill">
-      <mat-label>Choose a date</mat-label>
-      <input matInput [matDatepicker]="picker2">
-      <mat-datepicker-toggle matSuffix [for]="picker2"></mat-datepicker-toggle>
-      <mat-datepicker #picker2></mat-datepicker>
-    </mat-form-field> -->
-
-    
-    <!-- <mat-form-field appearance="fill">
-      <mat-label>Angular forms</mat-label>
-      <input matInput [matDatepicker]="picker1" [formControl]="date">
-      <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
-      <mat-datepicker #picker1></mat-datepicker>
-    </mat-form-field> -->
-
+    <!-- 2. datepicker in the popup -->
+   <!--  <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
 
     <div class="ion-item-container">
       <ion-input type="text"  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>

src/app/shared/event/attendee-modal/attendee-modal.page.html

@@ -1,7 +1,6 @@
 <ion-header class="ion-no-border px-20">
   <ion-toolbar class="px-10">
     <ion-title class="pa-0">Adicionar intervenientes</ion-title>
-    <ion-title>Agenda Desktop</ion-title>
   </ion-toolbar>
   <ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -251,7 +251,7 @@ export class EditEventToApproveComponent implements OnInit {
       Message: this.eventProcess.workflowInstanceDataFields.Message,
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
       Private: false,
-      ReviewerComments: ''
+      ReviewUserComments: ''
     }
     
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{