Improve

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

@@ -12,6 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
+import { EventToApproveEdit } from 'src/app/models/event.model';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -83,7 +84,7 @@ export class EditEventToApprovePage implements OnInit {
       StartDate: '',
       MDEmail: '',
       MDName: '',
-      IsAllDayEvent: '',
+      IsAllDayEvent: false,
       Message: ''
     }
   }
@@ -280,7 +281,7 @@ export class EditEventToApprovePage implements OnInit {
       }
     })
 
-    const event: any = {
+    const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
@@ -288,6 +289,7 @@ export class EditEventToApprovePage implements OnInit {
       StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
       EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
       ReviewUserComment: '',
+      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
       IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,

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

@@ -1,7 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { FormControl } from '@angular/forms';
 import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
-import * as moment from 'moment';
 import { Attachment } from 'src/app/models/attachment.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { SearchDocument } from 'src/app/models/search-document';
@@ -11,7 +9,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { Event } from '../../../models/event.model';
+import { Event, EventToApproveEdit } from '../../../models/event.model';
 import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { NavigationExtras, Router } from '@angular/router';
 
@@ -71,7 +69,6 @@ export class EditEventToApproveComponent implements OnInit {
       Body: "",
       OccurrenceType: '',
       LastOccurrence: '',
-      IsRecurring: false,
       ParticipantsList: [],
       Agenda: '',
       EndDate: '',
@@ -82,8 +79,9 @@ export class EditEventToApproveComponent implements OnInit {
       StartDate: '',
       MDEmail: '',
       MDName: '',
-      IsAllDayEvent: '',
-      Message: ''
+      IsAllDayEvent: false,
+      Message: '',
+      IsRecurring: false
     }
   }
 
@@ -235,7 +233,7 @@ export class EditEventToApproveComponent implements OnInit {
       }
     })
 
-    const event: any = {
+    const event: EventToApproveEdit = {
       SerialNumber: this.eventProcess.serialNumber,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
       Location: this.eventProcess.workflowInstanceDataFields.Location,
@@ -247,6 +245,7 @@ export class EditEventToApproveComponent implements OnInit {
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
       IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
       Status: null,
+      Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       EventType: this.eventProcess.workflowInstanceDataFields.EventType,
       IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
       Message: this.eventProcess.workflowInstanceDataFields.Message,

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -34,7 +34,7 @@
     </div>
 
     <div class="solid"></div>
-    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
   </div>
 
 </ion-content>

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -4,7 +4,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
@@ -322,23 +322,15 @@ export class DespachosPrOptionsPage implements OnInit {
     }     finally {
       loader.remove()
     }
-
   }
 
-
   goBack() {
-
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-
     this.location.back()
-
+    this.cancle()
   }
 
+  cancle() {
+    this.popoverController.dismiss()
+  }
 
 }