diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 14c1367ac..a517b0c40 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -140,6 +140,7 @@ export class HomePage implements OnInit { SessionStore.setUrlBeforeInactivity(pathname) this.router.navigate(['/inactivity']); } + } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 041202de9..66410a949 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -200,6 +200,9 @@ export class AgendaPage implements OnInit { } else { this.profile = "mdgpr"; } + + this.CalendarStore.ResetList([]) + }) if (this.loggeduser.Profile == 'MDGPR') { @@ -535,7 +538,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -564,7 +567,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -596,7 +599,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -633,7 +636,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -660,7 +663,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -697,7 +700,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -733,7 +736,7 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -779,7 +782,7 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -863,7 +866,7 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - console.log('check list to present data', this.listToPresent); + // console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 66d55bad0..0e8815d53 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -89,6 +89,8 @@ export class DespachoPage implements OnInit { this.LoadTaskDetail(this.serialnumber) }); + // this.ThemeService + } close() { diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 8dbd73aa7..08140e0a4 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -162,7 +162,7 @@ export class BookMeetingModalPage implements OnInit { } - } + } ngOnInit() { this.adding = "intervenient"; @@ -184,7 +184,7 @@ export class BookMeetingModalPage implements OnInit { this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000)) } - getAttachments(){ + getAttachments() { this.attachmentsService.getAttachmentsBySerial(this.task.SerialNumber).subscribe(res=>{ this.loadedAttachments = res; }); @@ -238,7 +238,7 @@ export class BookMeetingModalPage implements OnInit { }) } - async saveTask(){ + async saveTask() { if(this.loggeduser.Profile == 'MDGPR') { this.injectValidation() @@ -276,6 +276,9 @@ export class BookMeetingModalPage implements OnInit { }, } + + console.log(this.EventRecurrenceType) + if(this.task.FsId == '8') { const loader = this.toastService.loading() diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts index a6d0d98ef..609e7383a 100644 --- a/src/app/pages/inactivity/inactivity.page.ts +++ b/src/app/pages/inactivity/inactivity.page.ts @@ -202,7 +202,7 @@ export class InactivityPage implements OnInit { this.router.navigate([pathName],{replaceUrl: true}); } else { - setTimeout(()=>{ + setTimeout(() => { if(this.p.userPermission(this.p.permissionList.Agenda.access) || this.p.userPermission(this.p.permissionList.Gabinete.access)){ //When user has got access to Agenda but does not have their own calendar, goes to Agenda @@ -230,7 +230,7 @@ export class InactivityPage implements OnInit { storePin() { - setTimeout(()=>{ + setTimeout(() => { const code = this.code.join(''); SessionStore.setPin(code); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 2d5298d1d..6538dac79 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -82,6 +82,11 @@ export class EventsService { this.hasSharedCalendar = false this.hasOwnCalendar = false + this.headerOwnOficial= new HttpHeaders(); + this.headerOwnPessoal= new HttpHeaders(); + + this.headerSharedOficial= new HttpHeaders(); + this.headerSharedPessoal= new HttpHeaders(); this.calendarIds = [] diff --git a/src/app/services/inativity.service.ts b/src/app/services/inativity.service.ts index a93c50a3f..1ea52ceca 100644 --- a/src/app/services/inativity.service.ts +++ b/src/app/services/inativity.service.ts @@ -29,7 +29,7 @@ export class InativityService { function resetTimer() { clearTimeout(t); - t = setTimeout(userIsNotActive, 60000 * 15); // time is in milliseconds + t = setTimeout(userIsNotActive, 60000 * 5); // time is in milliseconds } } }