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

src/app/pages/agenda/agenda.module.ts

@@ -30,6 +30,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
 import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module';
 import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module';
+import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module';
 
 @NgModule({
   imports: [
@@ -53,6 +54,7 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event
     NewEventPageModule,
     EventListPageModule,
     EditEventPageModule,
+    EditEventToApprovePageModule,
   ],
   declarations: [
     AgendaPage

src/app/pages/agenda/agenda.page.html

@@ -356,7 +356,8 @@
           mobileComponent.showEventList == false &&
           mobileComponent.showEventToApprove == false &&
           mobileComponent.showAttendees == false &&
-          mobileComponent.showAttendeeModal == false
+          mobileComponent.showAttendeeModal == false &&
+          mobileComponent.showEditEventToApprove == false
         )
         "
         class="text-black nothing-to-show">
@@ -407,7 +408,9 @@
       ></app-view-event>
 
       
-      <app-event-list [class.transparent]="mobileComponent.transparentEventList" *ngIf="mobileComponent.showEventList"
+      <app-event-list 
+        [class.transparent]="mobileComponent.transparentEventList" 
+        *ngIf="mobileComponent.showEventList"
         [profile]="profile"
         (approveEventDismiss) = "approveEventDismiss($event)"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
@@ -415,15 +418,32 @@
       </app-event-list>
 
       
-      <app-approve-event  class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
+      <app-approve-event  class="d-flex flex-column" 
+        *ngIf="mobileComponent.showEventToApprove" 
+        [class.transparent]="mobileComponent.transparentEventToApprove"
         [serialNumber] = "eventToaprove.serialNumber"
         [InstanceId] = "eventToaprove.InstanceId"
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
         (closeEventToApprove)="closeEventToApprove()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"
+        (EditApproveEventDismiss)="EditApproveEventDismiss()"
         [eventAttendees]="contacts"
       >
       </app-approve-event>
+
+      <app-edit-event-to-approve
+        class="d-flex flex-column height-100"
+        *ngIf="mobileComponent.showEditEventToApprove"
+        [taskParticipants]="taskParticipants"
+        [taskParticipantsCc]="taskParticipantsCc"
+        [serialNumber] = "eventToaprove.serialNumber"
+        (setContact)="setContact($event)"
+        (clearContact)="clearContact()"
+        (openAttendeesComponent)="openAttendeesComponent($event)"
+        (closeComponent)="closeComponentEditEventOrAdd()"
+        (setIntervenient)="setIntervenient($event)"
+        (setIntervenientCC)="setIntervenientCC($event)"
+      ></app-edit-event-to-approve>
     
       <app-attendee-modal
         [footer]="true"

src/app/pages/agenda/agenda.page.ts

@@ -135,7 +135,8 @@ export class AgendaPage implements OnInit {
     transparentEventToApprove: false,
     showEventToApprove: false,
     showAttendees: false,
-    showAttendeeModal: false
+    showAttendeeModal: false,
+    showEditEventToApprove: false,
   }
 
   eventToaprove: any = {
@@ -1209,7 +1210,7 @@ export class AgendaPage implements OnInit {
   }
 
   async viewEventsToApprove(){
-    await this.cloneAllmobileComponent()
+    await this.cloneAllmobileComponent();
 
     if( window.innerWidth <= 801){
       this.router.navigate(['/home/agenda/event-list']);
@@ -1251,6 +1252,11 @@ export class AgendaPage implements OnInit {
     
   }
 
+  EditApproveEventDismiss(){
+    this.cloneAllmobileComponent();
+    this.mobileComponent.showEditEventToApprove = true;
+  }
+
   async cloneAllmobileComponent(){
 
     this.mobileComponent.showAddNewEvent = false;
@@ -1260,6 +1266,7 @@ export class AgendaPage implements OnInit {
     this.mobileComponent.showEventToApprove = false;
     this.mobileComponent.showAttendees = false;
     this.mobileComponent.showAttendeeModal = false;
+    this.mobileComponent.showEditEventToApprove = false;
 
     this.closeEventToApprove();
   }

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -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  placeholder="Selecione agenda*"
                 selectedText="{{postEvent.CalendarName}}" 
                 [(ngModel)]="postEvent.CalendarName" 
                 interface="action-sheet" Cancel-text="Cancelar" 

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

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
@@ -28,6 +29,8 @@ export class EditEventPage implements OnInit {
   selectedSegment: string;
   selectedDate: Date;
   minDate: string;
+  initCalendarName: string;
+  caller:string;
 
 
   loadedEventAttachments: Attachment[];
@@ -46,9 +49,12 @@ export class EditEventPage implements OnInit {
     private attachmentsService: AttachmentsService,
     private animationController: AnimationController,
     private toastService: ToastService,
+    private router: Router,
   ) {
     this.isEventEdited = false;
     this.postEvent = this.navParams.get('event');
+    this.caller = this.navParams.get('caller');
+    this.initCalendarName = this.postEvent.CalendarName;
 
     if(this.postEvent){
       if( this.postEvent.Body){
@@ -78,13 +84,13 @@ export class EditEventPage implements OnInit {
     else {
       this.isRecurring = "Repete";
     }
-    this.profile = this.navParams.get('profile');
-
+   
     this.getAttachments(this.postEvent.EventId);
   }
 
   ngOnInit() {
-    
+
+    console.log(this.caller);
     
     window.onresize = (event) => {
       // if not mobile remove all component
@@ -102,25 +108,31 @@ export class EditEventPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  goBack() {
+    console.log(this.caller);
+    this.router.navigate(['/home',this.caller]);
+  }
+
   save() {
-
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
-
     try{
       this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-        /* const alert = await this.alertController.create({
-          cssClass: 'my-custom-class',
-          header: 'Evento actualizado',
-          buttons: ['OK']
-        });
-        await alert.present(); */
+        if(this.initCalendarName != this.postEvent.CalendarName){
+          let body = {
+            "EventId": this.postEvent.EventId,
+            "CalendarDestinationName": this.postEvent.CalendarName,
+          }
+          console.log(body);
+          await this.eventsService.changeAgenda(body).toPromise();
+        }
+        this.toastService.successMessage();
 
-        this.toastService.successMessage()
       }, error => {
         this.toastService.badRequest()
       });
 
       this.isEventEdited = true;
+      this.goBack();
       this.modalController.dismiss(this.isEventEdited);
 
     } catch (error) {
@@ -179,7 +191,7 @@ export class EditEventPage implements OnInit {
   }
 
   addParticipantsCC(){
-    this.adding = 'CC'
+    this.adding = 'CC';
     this.openAttendees();
   }
 

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

@@ -35,6 +35,7 @@ export class ViewEventPage implements OnInit {
 
   profile:string;
   eventId:string;
+  caller:string;
   customDate:any;
   today:any;
   
@@ -62,8 +63,12 @@ export class ViewEventPage implements OnInit {
     this.eventBody = { BodyType : "1", Text : ""};
     this.loadedEvent.Body = this.eventBody;
 
-    this.activatedRoute.paramMap.subscribe(paramMap =>{
-      this.eventId = paramMap['params'].eventId;
+    this.activatedRoute.paramMap.subscribe(params =>{
+      this.eventId = params['params'].eventId;
+      if(params["params"].caller){
+        this.caller = (params["params"].caller);
+      }
+
     });
 
     /* this.activatedRoute.queryParams.subscribe(params => {
@@ -76,7 +81,6 @@ export class ViewEventPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log('Notifi teste '+this.eventId);
     this.loadEvent();
     this.getAttachments();
 
@@ -136,8 +140,8 @@ export class ViewEventPage implements OnInit {
         setTimeout(()=>{
           alert.dismiss();
         }, 1500);
+        this.goBack();
         this.toastService.successMessage('Evento apagado');
-        this.close();
       });  
   }
 
@@ -154,11 +158,14 @@ export class ViewEventPage implements OnInit {
 
   async editEventDetail() {
 
+    console.log(this.caller);
+    
+
     const modal = await this.modalController.create({
       component: EditEventPage,
       componentProps: {
         eventId: this.loadedEvent.EventId,
-        profile: this.profile,
+        caller: this.caller,
       },
       cssClass: 'modal modal-desktop',
 
@@ -192,7 +199,7 @@ export class ViewEventPage implements OnInit {
       component: EditEventPage,
       componentProps:{
         event: this.loadedEvent,
-        profile: this.profile,
+        caller: this.caller,
       },
       cssClass: classs,
     });