Fixe merge

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -14,7 +14,7 @@
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
-      <ion-title>Ações</ion-title>
+      <ion-title>Acções</ion-title>
     </ion-toolbar>
   </ion-header>
   <ion-content>
@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar</ion-label>
+        <ion-label>Adicionar Nota</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -72,7 +72,6 @@ export class ApproveEventModalPage implements OnInit {
   approveTask(serialNumber:string){
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
@@ -87,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
   
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     this.processes.PostTaskAction(body);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
@@ -132,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
       }
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/event-list']);
-    this.alertService.presentAlert('Operação realizada com sucesso!');
     }
     else{
       //this.alertService.presentAlert('Operação cancelada!');

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html

@@ -13,7 +13,7 @@
 
 <ion-content>
   <ion-item lines="none">
-    <ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite o seu comentário..."></ion-textarea>
+    <ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite uma nota..."></ion-textarea>
   </ion-item>
 </ion-content>
 <ion-footer>

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -1,7 +1,7 @@
 <ion-list>
   <ion-item>
     <p>
-      <ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Emendar</ion-button>
+      <ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Adicionar Nota</ion-button>
     </p>
     <p>
       <ion-button class="button-approve" shape="round" (click)="approveTask()">Aprovar</ion-button>

src/app/pages/agenda/view-event/view-event.page.ts

@@ -100,7 +100,10 @@ export class ViewEventPage implements OnInit {
           buttons: ['OK']
         });
     
-        await alert.present();
+        setTimeout(()=>{
+          alert.dismiss();
+        }, 1500);
+        
         this.close();
       });  
   }