diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index deee08cf1..e5d5fbdf8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -26,7 +26,7 @@

Eventos para Aprovação

-

{{count_ev_md+count_ev_pr}} Documentos

+

{{count_ev_apr}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d44ac7043..a36a58774 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -40,7 +40,7 @@ export class GabineteDigitalPage implements OnInit { count_dip_pv=0; count_dip_as = 0; count_de_pr = 0; - count_ev_pr=0; + count_ev_apr=0; count_ev_md=0; count_total_pending = 0; count_desp_pr_active = 0; @@ -258,12 +258,12 @@ export class GabineteDigitalPage implements OnInit { let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado"); this.count_dip_as_pr = Object.keys(diplomasAssinados).length; - this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{ - this.count_ev_pr = res; + this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{ + this.count_ev_apr = res; }); - this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{ + /* this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{ this.count_ev_md = res; - }); + }); */ this.showLoader = false; 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 cc617dba5..f7e2a5a2c 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -171,13 +171,14 @@
- - {{recurring.Description}} + *ngFor="let recurring of recurringTypes" + value="{{recurring.Code}}"> + {{recurring.Description}} diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index bf1774b8d..f47e6921b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -257,11 +257,15 @@ export class EditEventPage implements OnInit { if(this.Form.invalid) { return false } + if(this.selectedRecurringType != '-1'){ + this.postEvent.EventRecurrence.Type = this.selectedRecurringType; + } this.getDatepickerData() this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); - this.showLoader = true + this.showLoader = true; + await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { if(this.initCalendarName != this.postEvent.CalendarName) { let body = {