From f1d706a0d573780e10d406a80b68782d27263b8e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 13 Jul 2021 09:31:42 +0100 Subject: [PATCH] save --- .../agenda/edit-event/edit-event.page.html | 12 ----- .../agenda/edit-event/edit-event.page.ts | 14 +++--- .../shared/agenda/new-event/new-event.page.ts | 2 +- .../agenda/view-event/view-event.page.ts | 44 +++++++++---------- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 72b2bf2ae..858074597 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -192,18 +192,6 @@
- - - - { this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); + console.log(this.selectedRecurringType); }, 1000); + + + } close() { @@ -209,9 +213,9 @@ export class EditEventPage implements OnInit { dateEnd: new FormControl(this.dateEnd, [ Validators.required ]), - IsRecurring: new FormControl(this.postEvent.IsRecurring, [ + /* IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required - ]), + ]), */ participantes: new FormControl(this.taskParticipants, [ Validators.required ]), diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 3165b9005..2dcb1f92c 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -352,8 +352,8 @@ export class NewEventPage implements OnInit { if (this.postEvent) { this.dateControlStart = new FormControl(moment(this.postEvent.StartDate, "DD MM YYYY hh:mm")); this.dateControlEnd = new FormControl(moment(this.postEvent.EndDate, "DD MM YYYY hh:mm")); + this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY hh:mm")) } - } async save() { diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 7e639e8cd..f334d53d7 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -33,10 +33,10 @@ export class ViewEventPage implements OnInit { customDate:any; today:any; - + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; - + documents: Attachment[] = []; dicIndex = 0; @@ -54,7 +54,7 @@ export class ViewEventPage implements OnInit { private modalController: ModalController, public popoverController: PopoverController, private toastService: ToastService, - ) + ) { this.isEventEdited = false; this.loadedEvent = new Event(); @@ -63,19 +63,19 @@ export class ViewEventPage implements OnInit { } ngOnInit() { - + /* console.log(this.eventId); */ this.loadEvent(); //this.getAttachments(); } - + ngOnChanges(changes: any): void { this.loadedAttachments = null; this.loadEvent(); } openOptions(){ - + } docIndex(index: number) { @@ -84,7 +84,7 @@ export class ViewEventPage implements OnInit { close(){ console.log(this.isEventEdited); - + this.viewEventDetailDismiss.emit({ type: 'close' }) @@ -93,7 +93,7 @@ export class ViewEventPage implements OnInit { loadEvent(){ this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; - // console.log(res); + console.log(res); this.today = new Date(res.StartDate); // console.log(new Date(this.today)); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); @@ -102,11 +102,11 @@ export class ViewEventPage implements OnInit { } deleteEvent(){ - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => { this.toastService.successMessage('Evento apagado'); this.close(); - }); + }); } getAttachments(eventId){ @@ -122,14 +122,14 @@ export class ViewEventPage implements OnInit { event: this.loadedEvent }) } - + viewDocument(sourceId){ this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{ console.log(res); const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); const browser = this.iab.create(url,"_blank"); browser.show(); - + }); } @@ -149,9 +149,9 @@ export class ViewEventPage implements OnInit { taskStartDate: doc.CreateDate, isEvent: true, workflowInstanceDataFields: { - FsId: doc.ApplicationId, + FsId: doc.ApplicationId, FolderID: null, - DocId: doc.SourceId, + DocId: doc.SourceId, Subject: doc.SourceName }, } @@ -170,7 +170,7 @@ export class ViewEventPage implements OnInit { console.log(res['data']); if(res['data']=='openDiscart'){ console.log('open discart'); - + // this.distartExpedientModal(); } @@ -187,13 +187,13 @@ export class ViewEventPage implements OnInit { taskStartDate: doc.CreateDate, isEvent: true, workflowInstanceDataFields: { - FsId: doc.ApplicationId, + FsId: doc.ApplicationId, FolderID: null, - DocId: doc.SourceId, + DocId: doc.SourceId, Subject: doc.SourceName }, } - + let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -213,7 +213,7 @@ export class ViewEventPage implements OnInit { } - + async openTaskOptions() { const doc = this.loadedAttachments[ this.dicIndex]; @@ -223,9 +223,9 @@ export class ViewEventPage implements OnInit { taskStartDate: doc.CreateDate, isEvent: true, workflowInstanceDataFields: { - FsId: doc.ApplicationId, + FsId: doc.ApplicationId, FolderID: null, - DocId: doc.SourceId, + DocId: doc.SourceId, Subject: doc.SourceName }, } @@ -242,4 +242,4 @@ export class ViewEventPage implements OnInit { return await popover.present(); } -} \ No newline at end of file +}