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

Fix test

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-15 12:29:37 +01:00
parent 77a59e5128
commit bf5b604e1b
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+2 -1
View File
@@ -1,4 +1,5 @@
PUPPETEER_HOST = http://127.0.0.1:8080 PUPPETEER_HOST = http://localhost:8100
PUPPETEER_PORT = 8080 PUPPETEER_PORT = 8080
PUPPETEER_OPEN_CHROME = true PUPPETEER_OPEN_CHROME = true
PUPPETEER_CHROME_PATH =
jest-puppeteer.config.js
+2 -1
View File
@@ -4,6 +4,7 @@ require('dotenv').config()
const port = process.env.PUPPETEER_PORT const port = process.env.PUPPETEER_PORT
const host = process.env.PUPPETEER_HOST const host = process.env.PUPPETEER_HOST
const openChrome = process.env.PUPPETEER_OPEN_CHROME const openChrome = process.env.PUPPETEER_OPEN_CHROME
const chromPath = process.env.PUPPETEER_CHROME_PATH
module.exports = { module.exports = {
server: { server: {
@@ -20,7 +21,7 @@ module.exports = {
width:1200, width:1200,
height:1080 height:1080
}, },
executablePath: '' executablePath: chromPath
}, },
browserContext: 'default', browserContext: 'default',
src/app/pages/agenda/agenda.page.ts
+2 -5
View File
@@ -464,7 +464,7 @@ export class AgendaPage implements OnInit {
} }
loadRangeEvents(startTime: Date, endTime: Date){ loadRangeEvents(startTime: Date, endTime: Date) {
this.eventSelectedDate = new Date(startTime); this.eventSelectedDate = new Date(startTime);
@@ -647,9 +647,8 @@ export class AgendaPage implements OnInit {
case "Pessoal": case "Pessoal":
//Inicializa o array eventSource //Inicializa o array eventSource
if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') { 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=[]; // this.eventSource=[];
@@ -847,7 +846,6 @@ export class AgendaPage implements OnInit {
} }
} else { } else {
// calendar // calendar
let counter = 0; let counter = 0;
@@ -980,7 +978,6 @@ export class AgendaPage implements OnInit {
} else { } 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) => { 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') { if(this.segment == 'Oficial') {
src/app/services/events.service.ts
+1 -1
View File
@@ -173,7 +173,7 @@ export class EventsService {
headers: this.headersMdPessoal, headers: this.headersMdPessoal,
params: params params: params
}; };
return this.http.get<any>(`${geturl}`, options); return this.http.get<any>(`${geturl}`, options)
} }
async getAllMdEvents(startdate:string, enddate:string) { async getAllMdEvents(startdate:string, enddate:string) {