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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-05 12:28:18 +01:00
parent bb7f3b3089 31dc57d0f8
commit cef6d3f944
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+9 -5
View File
@@ -518,18 +518,19 @@ export class AgendaPage implements OnInit {
if(window.innerWidth < 800){ if(window.innerWidth < 800){
this.showTimeline = false; // this.showTimeline = false;
switch (this.segment) { switch (this.segment) {
case "Combinado": case "Combinado":
//Inicializa o array eventSource //Inicializa o array eventSource
this.eventSource=[]; //this.eventSource=[];
if(this.profile == "mdgpr") { if(this.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') ).subscribe( this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => { response => {
// calendar
this.eventSource=[]; this.eventSource=[];
this.eventsList = response; this.eventsList = response;
@@ -761,11 +762,11 @@ export class AgendaPage implements OnInit {
} }
} else { } else {
this.showTimelinePR = false; //this.showTimelinePR = false;
this.showTimelineMD = false; //this.showTimelineMD = false;
// calendar // calendar
this.eventSource=[];
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => { response => {
@@ -780,6 +781,7 @@ export class AgendaPage implements OnInit {
this.eventsList = response; this.eventsList = response;
} }
this.eventSource=[];
// loop // loop
this.eventsList.forEach((element, eventIndex) => { this.eventsList.forEach((element, eventIndex) => {
@@ -825,6 +827,8 @@ export class AgendaPage implements OnInit {
this.eventsList = response; this.eventsList = response;
} }
this.eventSource=[];
this.eventsList.forEach((element, eventIndex) => { this.eventsList.forEach((element, eventIndex) => {
// calendar // calendar