diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 62697bb0d..b6465ec06 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -28,7 +28,7 @@ import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.serv export class EventsPage implements OnInit { /* Get current system date */ today = new Date(); - + 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"]; @@ -59,7 +59,7 @@ export class EventsPage implements OnInit { currentHoursMinutes: Date; showLoader: boolean; - + taskslist:DailyWorkTask[] = []; expedientList:any; @@ -72,8 +72,8 @@ export class EventsPage implements OnInit { loggeduser: User; constructor( - private eventService: EventsService, - private router: Router, + private eventService: EventsService, + private router: Router, private storageService:StorageService, public activatedRoute: ActivatedRoute, private alertController: AlertService, @@ -89,7 +89,7 @@ export class EventsPage implements OnInit { // list this.LoadList(); - + } ngOnInit() { @@ -102,7 +102,7 @@ export class EventsPage implements OnInit { this.showGreeting(); const pathname = window.location.pathname - + this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname) { this.RefreshEvents(); @@ -130,30 +130,30 @@ export class EventsPage implements OnInit { let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59"; - + if(this.loggeduser.Profile == 'MDGPR') { let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); - + const list = mdOficialEvents.concat(mdPessoalEvents); this.toDayEventStorage.reset(list) - + if(this.toDayEventStorage.eventsList.length > 0){ this.currentEvent = this.toDayEventStorage.eventsList[0].Subject; this.currentHoursMinutes = this.toDayEventStorage.eventsList[0].StartDate; } - + this.totalEvent = this.toDayEventStorage.eventsList.length; this.showLoader = false; - + } else if (this.loggeduser.Profile == 'PR') { let prOficialEvents= await this.eventService.getAllPrOficialEvents(start, end).toPromise(); let prPessoalEvents= await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - + const list = prOficialEvents.concat(prPessoalEvents); this.toDayEventStorage.reset(list) @@ -165,7 +165,7 @@ export class EventsPage implements OnInit { this.totalEvent = this.toDayEventStorage.eventsList.length; this.showLoader = false; - + } @@ -176,17 +176,17 @@ export class EventsPage implements OnInit { let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); - + this.eventsList = mdOficialEvents.concat(mdPessoalEvents); - + if(this.eventsList.length > 0){ this.currentEvent = this.eventsList[0].Subject; this.currentHoursMinutes = this.eventsList[0].StartDate; } - + this.totalEvent = this.eventsList.length; this.showLoader = false; - + } else{ @@ -203,9 +203,9 @@ export class EventsPage implements OnInit { this.totalEvent = this.eventsList.length; this.showLoader = false; - + } - + break; case "Pessoal": if(this.loggeduser.Profile == 'MDGPR'){ @@ -220,7 +220,7 @@ export class EventsPage implements OnInit { this.showLoader = false; }); } - + break; case "Oficial": if(this.loggeduser.Profile == 'MDGPR'){ @@ -234,7 +234,7 @@ export class EventsPage implements OnInit { this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; this.showLoader = false; }); - } + } break; } */ } @@ -276,7 +276,7 @@ export class EventsPage implements OnInit { async openEventDetail1(id:any){ console.log(id); - + const modal = await this.modalController.create({ component: EventDetailPage, componentProps: { @@ -294,6 +294,8 @@ export class EventsPage implements OnInit { switch (this.loggeduser.Profile) { case 'MDGPR': this.processes.GetTasksList("Expediente", false).subscribe(result => { + console.log(result); + this.expedienteStorage.reset(result) }); break; @@ -301,7 +303,7 @@ export class EventsPage implements OnInit { this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { this.expedienteStorage.reset(result) }); - break; + break; default: break; } @@ -346,7 +348,7 @@ export class EventsPage implements OnInit { } } } - - + + } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 57e33eb88..57c4335c5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', + apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */