Improve

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

@@ -102,6 +102,6 @@
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
-      <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
+      <button class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
     </div>
 </ion-footer>

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

@@ -18,7 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
 export class ApproveEventPage implements OnInit {
 
   event: Event;
-  loadedEvent:any;
+  @Input() loadedEvent:any;
   loadedAttachments:any;
   customDate:any;
   today:any;
@@ -28,6 +28,8 @@ export class ApproveEventPage implements OnInit {
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
   @Input() serialNumber:string;
+  @Input() showComponent:string;
+  @Input() componentTransparent: any
   @Input() InstanceId:string;
   @Input() showAside:boolean;
 
@@ -58,7 +60,11 @@ export class ApproveEventPage implements OnInit {
   ngOnInit() {
     this.getTask();
     this.getAttachments();
-    
+  }
+
+  ngOnChanges() {
+    this.getTask();
+    this.getAttachments();
   }
 
   notImplemented() {
@@ -94,6 +100,7 @@ export class ApproveEventPage implements OnInit {
     } catch (error) {
       this.toastService.badRequest()
     }   finally {
+      this.close()
       loader.remove()
     }
 
@@ -121,8 +128,9 @@ export class ApproveEventPage implements OnInit {
       this.toastService.successMessage('Evento rejeitado')
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado')
-    }     finally {
+    } finally {
       loader.remove()
+      this.close()
     }
 
   }

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

@@ -247,14 +247,14 @@ export class EditEventToApprovePage implements OnInit {
       //   Validators.required
       // ]),
       participantes: new FormControl(this.taskParticipants, [
-        Validators.required
+        // Validators.required
       ]),
 
     })
   }
 
-  save() {
-
+  async save() {
+    
     this.injectValidation()
     this.runValidation()
 
@@ -263,6 +263,8 @@ export class EditEventToApprovePage implements OnInit {
     // set dates to eventProcess object
     this.getDatepickerData()
 
+
+
     this.taskParticipantsCc.forEach( e => {
       e.IsRequired = false
     })
@@ -300,24 +302,28 @@ export class EditEventToApprovePage implements OnInit {
 
     console.log(event);
 
-    this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
+    try {
+      await  this.eventsService.postEventToApproveEdit(event).toPromise()
+      this.close()
       this.toastService.successMessage('Evento editado');
-    }, error =>{
-      this.toastService.badRequest('Evento não editado');
-    })
+      
 
+    } catch(e) {
+      this.toastService.badRequest('Evento não editado');
+    }
+  
     this.loadedAttachments.forEach((document:any)=>{
       if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
-          this.toastService.successMessage();
+          // this.toastService.successMessage();
         }, error =>{
           this.toastService.badRequest();
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
-          this.toastService.successMessage()
+          // this.toastService.successMessage()
         }, error =>{
           this.toastService.badRequest()
         })
@@ -325,8 +331,6 @@ export class EditEventToApprovePage implements OnInit {
 
     })
 
-    this.modalController.dismiss();
-
   }
 
   // setIntervenient(data){

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

@@ -27,6 +27,7 @@ export class EventListPage implements OnInit {
   segment:string;
 
   @Input() profile:string;
+  @Input() showComponent:string;
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
   @Output() approveEventDismiss = new EventEmitter<any>();
 
@@ -55,6 +56,10 @@ export class EventListPage implements OnInit {
     });
   }
 
+  ngOnChanges() {
+    this.LoadToApproveEvents();
+  } 
+
   segmentChanged(ev: any) {
     this.LoadToApproveEvents();
   }