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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-16 16:55:47 +01:00
parent 16c8e27d34
commit a1911b4cfb
4 changed files with 136 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/events.service.ts
+35 -4
View File
@@ -149,7 +149,17 @@ export class EventsService {
return this.http.get<Event[]>(`${geturl}`, options);
}
getAllMdOficialEvents(startdate:string, enddate:string): Observable<Event[]>{
async getAllPrEvents(startdate:string, enddate:string){
let prO = await this.getAllPrOficialEvents(startdate, enddate).toPromise();
let prP = await this.getAllPrPessoalEvents(startdate, enddate).toPromise();
const resFinal = prO.concat(prP);
console.log(resFinal);
return new Promise(resolve =>{
return resolve(resFinal)
})
}
getAllMdOficialEvents(startdate:string, enddate:string): any{
const geturl = environment.apiURL + 'calendar/md';
let params = new HttpParams();
@@ -160,10 +170,10 @@ export class EventsService {
headers: this.headersMdOficial,
params: params
};
return this.http.get<Event[]>(`${geturl}`, options);
return this.http.get<any>(`${geturl}`, options);
}
getAllMdPessoalEvents(startdate:string, enddate:string): Observable<Event[]>{
getAllMdPessoalEvents(startdate:string, enddate:string): any{
const geturl = environment.apiURL + 'calendar/md';
let params = new HttpParams();
@@ -174,7 +184,17 @@ export class EventsService {
headers: this.headersMdPessoal,
params: params
};
return this.http.get<Event[]>(`${geturl}`, options);
return this.http.get<any>(`${geturl}`, options);
}
async getAllMdEvents(startdate:string, enddate:string){
let prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
let prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
const resFinal = prO.concat(prP);
console.log(resFinal);
return new Promise(resolve =>{
return resolve(resFinal)
});
}
@@ -207,6 +227,17 @@ export class EventsService {
return this.http.get<Event[]>(`${geturl}`, options);
}
async getAllSharedEvents(startdate:string, enddate:string){
let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
const resFinal = prO.concat(prP);
console.log(resFinal);
return new Promise(resolve =>{
return resolve(resFinal)
});
}