diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 9a24cdde1..cc9c5c97e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -143,10 +143,6 @@ const routes: Routes = [ }, { path: 'gabinete-digital', - resolve: { - diplomas: ProcessesResolverService, - pendentes: PendentesResolverService, - }, children: [ { path:'', diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index fdc313e1e..df8088032 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -71,6 +71,7 @@ export class NewEventPage implements OnInit { ) { this.loggeduser = userService.ValidatedUser; this.postEvent = new Event(); + this.postEvent.EventRecurrence = {Type:'-1'}; this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; /* this.profile = this.navParams.get('profile'); */ @@ -109,7 +110,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, - EventRecurrence: null, + EventRecurrence: {Type:'-1'}, }; } else{ @@ -131,7 +132,7 @@ export class NewEventPage implements OnInit { Organizer: '', Categories: ['Reunião'], HasAttachments: false, - EventRecurrence: null, + EventRecurrence: {Type:'-1'}, }; } @@ -219,6 +220,9 @@ export class NewEventPage implements OnInit { if(this.documents.length >= 0) { this.postEvent.HasAttachments = true; } + if(this.selectedRecurringType != '-1'){ + this.postEvent.EventRecurrence.Type = this.selectedRecurringType; + } let eventId: any; @@ -226,6 +230,8 @@ export class NewEventPage implements OnInit { if(this.loggeduser.Profile == 'MDGPR') { console.log(this.loggeduser.Profile); + + console.log(this.postEvent); eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise(); console.log(eventId); diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index d2dbf3ede..2c0bca6ff 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -9,7 +9,7 @@
Expediente
-
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index cf7806367..f917efde2 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -27,8 +27,8 @@ -
-
+
+
- diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index e6bc80346..3d9309608 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -1,15 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; -import { ModalController, NavParams } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; -import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; -import { AuthService } from 'src/app/services/auth.service'; -import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page'; @Component({ @@ -37,11 +33,9 @@ export class PendentesPage implements OnInit { private activatedRoute: ActivatedRoute, ) { this.profile = 'mdgpr'; - } ngOnInit() { - this.initPendentes(); //Inicializar segment this.segment = "despachos"; this.router.events.forEach((event) => { @@ -50,37 +44,6 @@ export class PendentesPage implements OnInit { } }); } - - initPendentes(){ - this.activatedRoute.data.subscribe(data => { - console.log(data['pendentes']); - data['pendentes'].forEach(element => { - let DocId = element.workflowInstanceDataFields.FolderID; - let ApplicationId = element.workflowInstanceDataFields.ApplicationId; - - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - console.log(task); - - this.pendentesList.push.call(task); - this.pendentesList = removeDuplicate( this.pendentesList); - }); - }); - } segmentChanged(ev: any) { this.refreshing(); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 1ed33878c..3179d1616 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -231,7 +231,7 @@ export class EventsService { } getRecurrenceTypes(): any{ - const geturl = environment.apiURL + 'Calendar/ListEventRepeatTypes'; + const geturl = environment.apiURL + 'Calendar/RecurrenceTypes'; let options = { headers: this.headers, }; diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 2d8f048d2..2e6981968 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -2,18 +2,13 @@
Expediente
-
- - - - -
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 62bfd8120..e945a551d 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -117,9 +117,10 @@ export class ExpedientesPrPage implements OnInit { }, 1500); } - doRefresh() { + doRefresh(event) { this.LoadList(); setTimeout(() => { + event.target.complete(); }, 2000); }