peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Peter Maquiran
2022-04-22 15:03:09 +01:00
parent 20da76a5bb
commit 59a6b8c08a
7 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+1
View File
@@ -140,6 +140,7 @@ export class HomePage implements OnInit {
SessionStore.setUrlBeforeInactivity(pathname)
this.router.navigate(['/inactivity']);
}
}
src/app/pages/agenda/agenda.page.ts
+12 -9
View File
@@ -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();
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+2
View File
@@ -89,6 +89,8 @@ export class DespachoPage implements OnInit {
this.LoadTaskDetail(this.serialnumber)
});
// this.ThemeService
}
close() {
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+6 -3
View File
@@ -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()
src/app/pages/inactivity/inactivity.page.ts
+2 -2
View File
@@ -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);
src/app/services/events.service.ts
+5
View File
@@ -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 = []
src/app/services/inativity.service.ts
+1 -1
View File
@@ -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
}
}
}