diff --git a/.env.example b/.env.example index 330412d9a..084d3ae5c 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,5 @@ -PUPPETEER_HOST = http://127.0.0.1:8080 +PUPPETEER_HOST = http://localhost:8100 PUPPETEER_PORT = 8080 PUPPETEER_OPEN_CHROME = true +PUPPETEER_CHROME_PATH = \ No newline at end of file diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 9bb3564c5..a798f5e91 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -4,6 +4,7 @@ require('dotenv').config() const port = process.env.PUPPETEER_PORT const host = process.env.PUPPETEER_HOST const openChrome = process.env.PUPPETEER_OPEN_CHROME +const chromPath = process.env.PUPPETEER_CHROME_PATH module.exports = { server: { @@ -20,7 +21,7 @@ module.exports = { width:1200, height:1080 }, - executablePath: '' + executablePath: chromPath }, browserContext: 'default', diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index aea0288f8..1aac987eb 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -464,7 +464,7 @@ export class AgendaPage implements OnInit { } - loadRangeEvents(startTime: Date, endTime: Date){ + loadRangeEvents(startTime: Date, endTime: Date) { this.eventSelectedDate = new Date(startTime); @@ -647,9 +647,8 @@ export class AgendaPage implements OnInit { case "Pessoal": //Inicializa o array eventSource - if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { - this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => { + this.eventService.getAllMdPessoalEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => { // this.eventSource=[]; @@ -847,7 +846,6 @@ export class AgendaPage implements OnInit { } } else { - // calendar let counter = 0; @@ -980,7 +978,6 @@ export class AgendaPage implements OnInit { } else { - this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => { if(this.segment == 'Oficial') { diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 1e8ea2100..fbcbc4275 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -173,7 +173,7 @@ export class EventsService { headers: this.headersMdPessoal, params: params }; - return this.http.get(`${geturl}`, options); + return this.http.get(`${geturl}`, options) } async getAllMdEvents(startdate:string, enddate:string) {