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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-15 17:42:51 +01:00
parent 1682d63a42
commit b9d4e2dc95
9 changed files with 239 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.ts
+33 -26
View File
@@ -114,7 +114,7 @@ export class EventsPage implements OnInit {
this.RefreshEvents();
}
RefreshEvents(){
async RefreshEvents(){
this.currentEvent = "";
this.showLoader = true;
@@ -127,43 +127,49 @@ export class EventsPage implements OnInit {
{
case "Combinada":
if(this.loggeduser.Profile == 'MDGPR'){
this.eventService.getAllMdEvents(start, end).subscribe(res => {
this.eventsList = res;
let mdOficialEvents = await this.eventService.getAllPrOficialEvents(start, end).toPromise();
let mdPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
this.eventsList = mdOficialEvents.concat(mdPessoalEvents);
if(res.length > 0){
this.currentEvent = res[0].Subject;
this.currentHoursMinutes = res[0].StartDate;
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{
this.eventService.getAllPrEvents(start, end).subscribe(res => {
this.eventsList = res;
console.log(this.eventsList);
console.log(res);
console.log(res[0]);
}
else{
if(res.length > 0){
this.currentEvent = res[0].Subject;
this.currentHoursMinutes = res[0].StartDate;
}
let prOficialEvents= await this.eventService.getAllPrOficialEvents(start, end).toPromise();
let prPessoalEvents= await this.eventService.getAllPrPessoalEvents(start, end).toPromise();
this.eventsList = prOficialEvents.concat(prPessoalEvents);
console.log(this.eventsList);
console.log(this.eventsList);
this.totalEvent = this.eventsList.length;
this.showLoader = false;
});
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;
}
break;
case "Pessoal":
if(this.loggeduser.Profile == 'MDGPR'){
this.eventService.getAllMdEvents(start, end).subscribe(res => {
this.eventService.getAllMdPessoalEvents(start, end).subscribe(res => {
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(start, end).subscribe(res => {
}
else{
this.eventService.getAllPrPessoalEvents(start, end).subscribe(res => {
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
this.showLoader = false;
});
@@ -172,12 +178,13 @@ export class EventsPage implements OnInit {
break;
case "Oficial":
if(this.loggeduser.Profile == 'MDGPR'){
this.eventService.getAllMdEvents(start, end).subscribe(res => {
this.eventService.getAllMdOficialEvents(start, end).subscribe(res => {
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(start, end).subscribe(res => {
}
else{
this.eventService.getAllPrOficialEvents(start, end).subscribe(res => {
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
this.showLoader = false;
});