mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Fix test
This commit is contained in:
+2
-1
@@ -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 =
|
||||
@@ -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',
|
||||
|
||||
|
||||
@@ -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') {
|
||||
|
||||
@@ -173,7 +173,7 @@ export class EventsService {
|
||||
headers: this.headersMdPessoal,
|
||||
params: params
|
||||
};
|
||||
return this.http.get<any>(`${geturl}`, options);
|
||||
return this.http.get<any>(`${geturl}`, options)
|
||||
}
|
||||
|
||||
async getAllMdEvents(startdate:string, enddate:string) {
|
||||
|
||||
Reference in New Issue
Block a user