Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into developer-c

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
@@ -136,6 +136,8 @@ export class ApproveEventComponent implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
+      console.log(res.data);
+      
       if(res.data !== ''){
         let body = { "serialNumber": serialNumber, 
         "action": "Emendar",
@@ -145,8 +147,9 @@ export class ApproveEventComponent implements OnInit {
         }
       console.log(body);
       this.processes.PostTaskAction(body);
-      this.router.navigate(['/home/gabinete-digital/event-list']);
+      //this.router.navigate(['/home/gabinete-digital/event-list']);
       this.alertService.presentAlert('Operação realizada com sucesso!');
+      this.goToEventsToApprove();
       }
       else{
         this.alertService.presentAlert('Operação cancelada!');
@@ -154,4 +157,13 @@ export class ApproveEventComponent implements OnInit {
     });
   }
 
+  goToEventsToApprove(){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "events": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  }
+
 }

src/app/shared/agenda/new-event/new-event.component.ts

@@ -63,7 +63,7 @@ export class NewEventPage implements OnInit {
           Body: this.eventBody,
           Location: '',
           CalendarId: '',
-          CalendarName: this.selectedSegment,
+          CalendarName: '',
           StartDate: selectedStartdDate,
           EndDate: new Date(selectedEndDate),
           EventType: 'Reunião',

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -1,6 +1,9 @@
 <ion-content>
   <div class="title width-100">
-    <label>Eventos para Aprovação</label>
+    <div class="title-container">
+      <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
+      <ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
+    </div>
     <ion-toolbar>
       <ion-segment [(ngModel)]="profile">
         <ion-segment-button value="MDGPR">

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss

@@ -2,6 +2,15 @@
     padding: 30px 20px 0 20px !important;
     margin: 0;
 }
+.title-container{
+  margin-bottom: 15px;
+  .title-icon{
+    float: right;
+    margin-right: 20px;
+    font-size: 30px;
+    color: #0782c9;
+  }
+}
 .title{
     font-family: Roboto;
     font-size: 25px;